wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Alexandre Julliard : gdi32/tests: Simplify the DIB byte width computation.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: afa7817d6e26456e2d1aec9d42cf2447f0ead809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa7817d6e26456e2d1aec9d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 13:22:53 2011 +0200 gdi32/tests: Simplify the DIB byte width computation. --- dlls/gdi32/tests/bitmap.c | 20 +------------------- 1 files changed, 1 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index d5a39be..2a68597 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -255,25 +255,7 @@ static void test_createdibitmap(void) static INT DIB_GetWidthBytes( int width, int bpp ) { - int words; - - switch (bpp) - { - case 1: words = (width + 31) / 32; break; - case 4: words = (width + 7) / 8; break; - case 8: words = (width + 3) / 4; break; - case 15: - case 16: words = (width + 1) / 2; break; - case 24: words = (width * 3 + 3)/4; break; - case 32: words = width; break; - - default: - words=0; - trace("Unknown depth %d, please report.\n", bpp ); - assert(0); - break; - } - return 4 * words; + return ((width * bpp + 31) / 8) & ~3; } static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER *bmih)

1 0

Alexandre Julliard : gdi32: Add parameter validation in GetDIBits.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 4e3c649b9c93df27e824f57502fe22b47e58c05f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e3c649b9c93df27e824f5750… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 11:30:36 2011 +0200 gdi32: Add parameter validation in GetDIBits. --- dlls/gdi32/dib.c | 50 ++++++++++++++++++++++---- dlls/gdi32/tests/bitmap.c | 86 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 125 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e3c649b9c93df27e824f…

1 0

Alexandre Julliard : user32: Pass valid dimensions to GetDIBits.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 43240527b61aa7c1b4663cd53c2d359284e6849d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43240527b61aa7c1b4663cd53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 11:29:25 2011 +0200 user32: Pass valid dimensions to GetDIBits. --- dlls/user32/cursoricon.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 4c7658d..aeb1987 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2732,12 +2732,11 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, memcpy(bi, &ds.dsBmih, sizeof(BITMAPINFOHEADER)); } - /* Get the color table or the color masks */ - GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); - bi->bmiHeader.biWidth = desiredx; bi->bmiHeader.biHeight = desiredy; - bi->bmiHeader.biSizeImage = 0; + + /* Get the color table or the color masks */ + GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); res = CreateDIBSection(dc, bi, DIB_RGB_COLORS, &bits, NULL, 0); DeleteDC(dc); @@ -2753,8 +2752,8 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, /* The source bitmap is a DIB section. Get its attributes */ HDC dc = CreateCompatibleDC(NULL); - bi->bmiHeader.biSize = sizeof(bi->bmiHeader); - bi->bmiHeader.biBitCount = ds.dsBm.bmBitsPixel; + bi->bmiHeader.biWidth = ds.dsBm.bmWidth; + bi->bmiHeader.biHeight = ds.dsBm.bmHeight; GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); DeleteDC(dc);

1 0

Alexandre Goujon : include: Add more GetVolumeInformation system flags.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 94bef59bb2c363d570c4e33aa13e44a93abc5c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94bef59bb2c363d570c4e33aa… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Sun Aug 28 13:05:01 2011 +0200 include: Add more GetVolumeInformation system flags. --- include/winnt.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 5c58656..8ff6a7f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4779,6 +4779,9 @@ typedef struct _QUOTA_LIMITS_EX { #define FILE_UNICODE_ON_DISK 0x00000004 #define FILE_PERSISTENT_ACLS 0x00000008 #define FILE_FILE_COMPRESSION 0x00000010 +#define FILE_VOLUME_QUOTAS 0x00000020 +#define FILE_SUPPORTS_SPARSE_FILES 0x00000040 +#define FILE_SUPPORTS_REPARSE_POINTS 0x00000080 #define FILE_VOLUME_IS_COMPRESSED 0x00008000 #define FILE_SUPPORTS_OBJECT_IDS 0x00010000 #define FILE_SUPPORTS_ENCRYPTION 0x00020000

1 0

Michael Stefaniuc : dsound/tests: Primary and secondary buffers use the same IDirectSoundBuffer vtbl.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 7959778d3f84680fcee2e0d43cfcd0e613d68242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7959778d3f84680fcee2e0d43… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 29 00:28:50 2011 +0200 dsound/tests: Primary and secondary buffers use the same IDirectSoundBuffer vtbl. --- dlls/dsound/tests/dsound.c | 3 +++ dlls/dsound/tests/dsound8.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 64b188c..be846df 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -627,6 +627,9 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { + todo_wine ok(primary->lpVtbl==secondary->lpVtbl, + "Primary and secondary buffers have different vtbls.\n"); + test_buffer(dso,&secondary,0,FALSE,0,FALSE,0, winetest_interactive,1.0,0,NULL,0,0,FALSE,0); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 6406b47..87d9adb 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -639,6 +639,9 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) "buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { + todo_wine ok(primary->lpVtbl==secondary->lpVtbl, + "Primary and secondary buffers have different vtbls.\n"); + test_buffer8(dso,&secondary,0,FALSE,0,FALSE,0, winetest_interactive,1.0,0,NULL,0,0);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_wined3d() const.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: e1f83fd205c669204073f0f5b5dad6dd6de2d836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f83fd205c669204073f0f5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 28 23:27:49 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_wined3d() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ef73487..8593a6a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1684,7 +1684,7 @@ HRESULT CDECL wined3d_device_set_display_mode(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_wined3d(struct wined3d_device *device, struct wined3d **wined3d) +HRESULT CDECL wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d) { TRACE("device %p, wined3d %p.\n", device, wined3d); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b2d4663..3a1cb87 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2271,7 +2271,7 @@ HRESULT __cdecl wined3d_device_get_vs_consts_f(struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_vs_consts_i(struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); -HRESULT __cdecl wined3d_device_get_wined3d(struct wined3d_device *device, struct wined3d **d3d); +HRESULT __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, WINED3DPRESENT_PARAMETERS *present_parameters); HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, WINED3DPRESENT_PARAMETERS *present_parameters);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_swapchain() const.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 2ff7a356d24a5a63bb1fdac1a5fd5e42c56ad88f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff7a356d24a5a63bb1fdac1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 28 23:27:48 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_swapchain() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8f7b35d..ef73487 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -886,7 +886,7 @@ UINT CDECL wined3d_device_get_swapchain_count(const struct wined3d_device *devic return device->swapchain_count; } -HRESULT CDECL wined3d_device_get_swapchain(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_swapchain(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_swapchain **swapchain) { TRACE("device %p, swapchain_idx %u, swapchain %p.\n", diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1ea6857..b2d4663 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2252,7 +2252,7 @@ HRESULT __cdecl wined3d_device_get_stream_source(struct wined3d_device *device, HRESULT __cdecl wined3d_device_get_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT *divider); HRESULT __cdecl wined3d_device_get_surface_from_dc(struct wined3d_device *device, HDC dc, struct wined3d_surface **surface); -HRESULT __cdecl wined3d_device_get_swapchain(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_swapchain(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_swapchain **swapchain); UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_texture(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_swapchain_count() const.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: a3f23541c1b3f9d54863c0680e17bb774150b648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f23541c1b3f9d54863c0680… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 28 23:27:47 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_swapchain_count() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8afa2d8..8f7b35d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -879,7 +879,7 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) return refcount; } -UINT CDECL wined3d_device_get_swapchain_count(struct wined3d_device *device) +UINT CDECL wined3d_device_get_swapchain_count(const struct wined3d_device *device) { TRACE("device %p.\n", device); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bfc1b39..1ea6857 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2254,7 +2254,7 @@ HRESULT __cdecl wined3d_device_get_surface_from_dc(struct wined3d_device *device HDC dc, struct wined3d_surface **surface); HRESULT __cdecl wined3d_device_get_swapchain(struct wined3d_device *device, UINT swapchain_idx, struct wined3d_swapchain **swapchain); -UINT __cdecl wined3d_device_get_swapchain_count(struct wined3d_device *device); +UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_texture(struct wined3d_device *device, UINT stage, struct wined3d_texture **texture); HRESULT __cdecl wined3d_device_get_texture_stage_state(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Make the target parameter to is_full_clear() const .
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: d5c2ba6d624f1d6703222e0aa30dba0a26f06c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c2ba6d624f1d6703222e0aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 28 23:27:46 2011 +0200 wined3d: Make the target parameter to is_full_clear() const. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 91d8dd9..8afa2d8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -581,7 +581,7 @@ void device_switch_onscreen_ds(struct wined3d_device *device, wined3d_surface_incref(device->onscreen_depth_stencil); } -static BOOL is_full_clear(struct wined3d_surface *target, const RECT *draw_rect, const RECT *clear_rect) +static BOOL is_full_clear(const struct wined3d_surface *target, const RECT *draw_rect, const RECT *clear_rect) { /* partial draw rect */ if (draw_rect->left || draw_rect->top

1 0

Henri Verbeet : wined3d: Rename WineD3DAdapterChangeGLRam() to adapter_adjust_memory().
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 78cbe0bc74118eed5313335abf00619c92acf7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=78cbe0bc74118eed5313335ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 28 23:27:45 2011 +0200 wined3d: Rename WineD3DAdapterChangeGLRam() to adapter_adjust_memory(). And make it work on an adapter instead of a device. --- dlls/wined3d/directx.c | 8 +++----- dlls/wined3d/resource.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 515bc46..ba2e970 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -369,12 +369,10 @@ fail: } /* Adjust the amount of used texture memory */ -unsigned int WineD3DAdapterChangeGLRam(struct wined3d_device *device, int glram) +unsigned int adapter_adjust_memory(struct wined3d_adapter *adapter, int amount) { - struct wined3d_adapter *adapter = device->adapter; - - adapter->UsedTextureRam += glram; - TRACE("Adjusted gl ram by %d to %d\n", glram, adapter->UsedTextureRam); + adapter->UsedTextureRam += amount; + TRACE("Adjusted adapter memory by %d to %d.\n", amount, adapter->UsedTextureRam); return adapter->UsedTextureRam; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 4dbe46e..4ff560d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -131,7 +131,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * HeapFree(GetProcessHeap(), 0, resource->heapMemory); return WINED3DERR_OUTOFVIDEOMEMORY; } - WineD3DAdapterChangeGLRam(device, size); + adapter_adjust_memory(device->adapter, size); } device_resource_add(device, resource); @@ -150,7 +150,7 @@ void resource_cleanup(struct wined3d_resource *resource) if (resource->pool == WINED3DPOOL_DEFAULT) { TRACE("Decrementing device memory pool by %u.\n", resource->size); - WineD3DAdapterChangeGLRam(resource->device, 0 - resource->size); + adapter_adjust_memory(resource->device->adapter, 0 - resource->size); } LIST_FOR_EACH_SAFE(e1, e2, &resource->privateData) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8fb5d27..05f2bf4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1525,9 +1525,10 @@ struct wined3d_adapter const struct blit_shader *blitter; }; +unsigned int adapter_adjust_memory(struct wined3d_adapter *adapter, int amount) DECLSPEC_HIDDEN; + BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN; BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -extern unsigned int WineD3DAdapterChangeGLRam(struct wined3d_device *device, int glram) DECLSPEC_HIDDEN; extern void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; /*****************************************************************************

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
77
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 August 2011