August 2011 - Wine-commits - list.winehq.org

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

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

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 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 : 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 : user32: Simplify the DIB byte width computation.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 16944f500dacb86cf0399c8830aa5ddab53015fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=16944f500dacb86cf0399c883… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 12:03:13 2011 +0200 user32: Simplify the DIB byte width computation. --- dlls/user32/cursoricon.c | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index aeb1987..7475ecab 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -316,29 +316,13 @@ static void *map_fileW( LPCWSTR name, LPDWORD filesize ) /*********************************************************************** - * get_dib_width_bytes + * get_dib_image_size * - * Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. + * Return the size of a DIB bitmap in bytes. */ -static int get_dib_width_bytes( int width, int depth ) +static int get_dib_image_size( int width, int height, int depth ) { - int words; - - switch(depth) - { - 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; - default: - WARN("(%d): Unsupported depth\n", depth ); - /* fall through */ - case 32: - words = width; - } - return 4 * words; + return (((width * depth + 31) / 8) & ~3) * abs( height ); } @@ -866,8 +850,7 @@ static HICON create_icon_from_bmi( BITMAPINFO *bmi, HMODULE module, LPCWSTR resn color_bits = (const char*)bmi + size; mask_bits = (const char*)color_bits + - get_dib_width_bytes( bmi->bmiHeader.biWidth, - bmi->bmiHeader.biBitCount ) * abs(bmi_copy->bmiHeader.biHeight); + get_dib_image_size( bmi->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, bmi->bmiHeader.biBitCount ); alpha = 0; if (monochrome) @@ -2084,7 +2067,7 @@ static void stretch_blt_icon( HDC hdc_dst, int dst_x, int dst_y, int dst_width, info->bmiHeader.biPlanes = GetDeviceCaps( hdc_dst, PLANES ); info->bmiHeader.biBitCount = GetDeviceCaps( hdc_dst, BITSPIXEL ); info->bmiHeader.biCompression = BI_RGB; - info->bmiHeader.biSizeImage = height * get_dib_width_bytes( width, info->bmiHeader.biBitCount ); + info->bmiHeader.biSizeImage = get_dib_image_size( width, height, info->bmiHeader.biBitCount ); info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0;

1 0

Nikolay Sivov : msxml3: Use element name length passed to content handler.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 2a6abc248de97a7eebeb3014c42e6547817bac0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a6abc248de97a7eebeb3014c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 27 17:35:13 2011 +0400 msxml3: Use element name length passed to content handler. --- dlls/msxml3/mxwriter.c | 15 ++++++++------- dlls/msxml3/tests/saxreader.c | 29 +++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index bf2411e..b08fd0b 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -155,16 +155,16 @@ static void close_element_starttag(const mxwriter *This) xmlOutputBufferWriteString(This->buffer, ">"); } -static void set_element_name(mxwriter *This, const WCHAR *name) +static void set_element_name(mxwriter *This, const WCHAR *name, int len) { SysFreeString(This->element); - This->element = SysAllocString(name); + This->element = name ? SysAllocStringLen(name, len) : NULL; } static inline HRESULT flush_output_buffer(mxwriter *This) { close_element_starttag(This); - set_element_name(This, NULL); + set_element_name(This, NULL, 0); xmlOutputBufferFlush(This->buffer); return write_data_to_stream(This); } @@ -763,10 +763,11 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( return E_INVALIDARG; close_element_starttag(This); - set_element_name(This, QName ? QName : emptyW); + set_element_name(This, QName ? QName : emptyW, + QName ? nQName : 0); xmlOutputBufferWriteString(This->buffer, "<"); - s = xmlchar_from_wchar(QName); + s = xmlchar_from_wcharn(QName, nQName); xmlOutputBufferWriteString(This->buffer, (char*)s); heap_free(s); @@ -843,7 +844,7 @@ static HRESULT WINAPI mxwriter_saxcontent_endElement( } heap_free(s); - set_element_name(This, NULL); + set_element_name(This, NULL, 0); return S_OK; } @@ -860,7 +861,7 @@ static HRESULT WINAPI mxwriter_saxcontent_characters( if (!chars) return E_INVALIDARG; close_element_starttag(This); - set_element_name(This, NULL); + set_element_name(This, NULL, 0); if (nchars) { diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 99a08c2..b5800d0 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1720,27 +1720,44 @@ static void test_mxwriter_startendelement(void) VariantClear(&dest); hr = ISAXContentHandler_endElement(content, NULL, 0, NULL, 0, _bstr_("a:b"), 3); - ok(hr == E_INVALIDARG, "got %08x\n", hr); + EXPECT_HR(hr, E_INVALIDARG); hr = ISAXContentHandler_endElement(content, NULL, 0, _bstr_("b"), 1, _bstr_("a:b"), 3); - ok(hr == E_INVALIDARG, "got %08x\n", hr); + EXPECT_HR(hr, E_INVALIDARG); /* only local name is an error too */ hr = ISAXContentHandler_endElement(content, NULL, 0, _bstr_("b"), 1, NULL, 0); - ok(hr == E_INVALIDARG, "got %08x\n", hr); + EXPECT_HR(hr, E_INVALIDARG); hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("b"), 1); - ok(hr == S_OK, "got %08x\n", hr); + EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; hr = IMXWriter_get_output(writer, &dest); - ok(hr == S_OK, "got %08x\n", hr); + EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); ok(!lstrcmpW(_bstr_("<><b></b>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXContentHandler_endDocument(content); - ok(hr == S_OK, "got %08x\n", hr); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("abcdef"), 3, NULL); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<abc>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); ISAXContentHandler_Release(content); IMXWriter_Release(writer);

1 0

Alasdair Sinclair : setupapi: Fix magic comparison on x64.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 3928f57658e43357f92e16292ee76032f0679a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3928f57658e43357f92e16292… Author: Alasdair Sinclair <alasdairsinc(a)gmail.com> Date: Sun Aug 28 19:57:53 2011 +0100 setupapi: Fix magic comparison on x64. --- dlls/setupapi/setupcab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index f4c6600..66cf792 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -287,7 +287,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p TRACE("(fdint == %d, pfdin == ^%p)\n", fdint, pfdin); - if (pfdin && pfdin->pv && (*((void **) pfdin->pv) == (void *)SC_HSC_A_MAGIC)) + if (pfdin && pfdin->pv && (((PSC_HSC_A) pfdin->pv)->magic == SC_HSC_A_MAGIC)) phsc = pfdin->pv; else { ERR("pv %p is not an SC_HSC_A.\n", (pfdin) ? pfdin->pv : NULL);

1 0

Damjan Jovanovic : winemenubuilder: Do case-insensitive glob comparisons.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 01d5a0f53b3bf03f8e6cd40dab019c2cdad18ef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01d5a0f53b3bf03f8e6cd40da… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 28 21:21:46 2011 +0200 winemenubuilder: Do case-insensitive glob comparisons. --- programs/winemenubuilder/winemenubuilder.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index f42f3b1..2dce850 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -179,6 +179,7 @@ struct xdg_mime_type { char *mimeType; char *glob; + char *lower_glob; struct list entry; }; @@ -1994,12 +1995,20 @@ static BOOL add_mimes(const char *xdg_data_dir, struct list *mime_types) *pos = 0; mime_type_entry->mimeType = strdupA(line); mime_type_entry->glob = strdupA(pos + 1); - if (mime_type_entry->mimeType && mime_type_entry->glob) + mime_type_entry->lower_glob = strdupA(pos + 1); + if (mime_type_entry->lower_glob) + { + char *l; + for (l = mime_type_entry->lower_glob; *l; l++) + *l = tolower(*l); + } + if (mime_type_entry->mimeType && mime_type_entry->glob && mime_type_entry->lower_glob) list_add_tail(mime_types, &mime_type_entry->entry); else { HeapFree(GetProcessHeap(), 0, mime_type_entry->mimeType); HeapFree(GetProcessHeap(), 0, mime_type_entry->glob); + HeapFree(GetProcessHeap(), 0, mime_type_entry->lower_glob); HeapFree(GetProcessHeap(), 0, mime_type_entry); ret = FALSE; } @@ -2026,6 +2035,7 @@ static void free_native_mime_types(struct list *native_mime_types) { list_remove(&mime_type_entry->entry); HeapFree(GetProcessHeap(), 0, mime_type_entry->glob); + HeapFree(GetProcessHeap(), 0, mime_type_entry->lower_glob); HeapFree(GetProcessHeap(), 0, mime_type_entry->mimeType); HeapFree(GetProcessHeap(), 0, mime_type_entry); } @@ -2084,7 +2094,7 @@ static BOOL build_native_mime_types(const char *xdg_data_home, struct list **mim } static BOOL match_glob(struct list *native_mime_types, const char *extension, - char **match) + int ignoreGlobCase, char **match) { #ifdef HAVE_FNMATCH struct xdg_mime_type *mime_type_entry; @@ -2094,12 +2104,13 @@ static BOOL match_glob(struct list *native_mime_types, const char *extension, LIST_FOR_EACH_ENTRY(mime_type_entry, native_mime_types, struct xdg_mime_type, entry) { - if (fnmatch(mime_type_entry->glob, extension, 0) == 0) + const char *glob = ignoreGlobCase ? mime_type_entry->lower_glob : mime_type_entry->glob; + if (fnmatch(glob, extension, 0) == 0) { - if (*match == NULL || matchLength < strlen(mime_type_entry->glob)) + if (*match == NULL || matchLength < strlen(glob)) { *match = mime_type_entry->mimeType; - matchLength = strlen(mime_type_entry->glob); + matchLength = strlen(glob); } } } @@ -2123,7 +2134,7 @@ static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, { WCHAR *lower_extensionW; INT len; - BOOL ret = match_glob(native_mime_types, extensionA, mime_type); + BOOL ret = match_glob(native_mime_types, extensionA, 0, mime_type); if (ret == FALSE || *mime_type != NULL) return ret; len = strlenW(extensionW); @@ -2136,7 +2147,7 @@ static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, lower_extensionA = wchars_to_utf8_chars(lower_extensionW); if (lower_extensionA) { - ret = match_glob(native_mime_types, lower_extensionA, mime_type); + ret = match_glob(native_mime_types, lower_extensionA, 1, mime_type); HeapFree(GetProcessHeap(), 0, lower_extensionA); } else

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