wine-commits August 2014

wine-commits@winehq.org

2 participants
304 discussions

Zhenbo Li : mshtml/tests: Fix test_tr_modify().
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 9ee4b8b0789716e61efce0f8c83b993a10819542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee4b8b0789716e61efce0f8c… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 16:55:34 2014 +0800 mshtml/tests: Fix test_tr_modify(). --- dlls/mshtml/tests/dom.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 33645c8..dddb28c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5801,7 +5801,7 @@ static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) { HRESULT hres; IDispatch *disp; - IUnknown *unk; + IHTMLTableCell *cell; hres = IHTMLTableRow_deleteCell(row, 0); ok(hres == S_OK, "deleteCell failed: %08x\n", hres); @@ -5810,10 +5810,11 @@ static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) hres = IHTMLTableRow_insertCell(row, 0, &disp); ok(hres == S_OK, "insertCell failed: %08x\n", hres); ok(disp != NULL, "disp == NULL\n"); - hres = IDispatch_QueryInterface(disp, &IID_IHTMLTableCell, (void **)&unk); + hres = IDispatch_QueryInterface(disp, &IID_IHTMLTableCell, (void **)&cell); ok(hres == S_OK, "Could not get IID_IHTMLTableCell interface: %08x\n", hres); + ok(cell != NULL, "cell == NULL\n"); if (SUCCEEDED(hres)) - IUnknown_Release(unk); + IHTMLTableCell_Release(cell); test_tr_possess(elem, row, 2, "td2"); IDispatch_Release(disp); }

1 0

André Hentschel : wpcap: Implement pcap_breakloop.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 2789538bd576c1651f3fcdafb709e7aa71217bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2789538bd576c1651f3fcdafb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:55:13 2014 +0200 wpcap: Implement pcap_breakloop. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index ab1de8f..81ff958 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -26,6 +26,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); +void CDECL wine_pcap_breakloop(pcap_t *p) +{ + TRACE("(%p)\n", p); + return pcap_breakloop(p); +} + int CDECL wine_pcap_compile(pcap_t *p, struct bpf_program *program, const char *buf, int optimize, unsigned int mask) { diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index d6116d2..2cdc6cd 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -6,7 +6,7 @@ @ stub eproto_db @ stub getservent @ stub install_bpf_program -@ stub pcap_breakloop +@ cdecl pcap_breakloop(ptr) wine_pcap_breakloop @ stub pcap_close @ cdecl pcap_compile(ptr ptr str long long) wine_pcap_compile @ stub pcap_compile_nopcap

1 0

André Hentschel : wpcap: Implement pcap_loop.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: d45f9144a14d689ea8563c6f9e91ae7b14c37b82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45f9144a14d689ea8563c6f9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 22:48:14 2014 +0200 wpcap: Implement pcap_loop. --- dlls/wpcap/wpcap.c | 18 ++++++++++++++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b80a4e0..ab1de8f 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -123,6 +123,24 @@ int CDECL wine_pcap_lookupnet(const char *device, unsigned int *netp, unsigned i return pcap_lookupnet(device, netp, maskp, errbuf); } +int CDECL wine_pcap_loop(pcap_t *p, int cnt, + void (CALLBACK *callback)(u_char *, const struct pcap_pkthdr *, const u_char *), + unsigned char *user) +{ + TRACE("(%p %i %p %p)\n", p, cnt, callback, user); + + if (callback) + { + PCAP_HANDLER_CALLBACK *pcb; + pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); + pcb->pfn_cb = callback; + pcb->user_data = user; + return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char*)pcb); + } + + return pcap_loop(p, cnt, NULL, user); +} + int CDECL wine_pcap_major_version(pcap_t *p) { TRACE("(%p)\n", p); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 92b5052..d6116d2 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -39,7 +39,7 @@ @ stub pcap_live_dump_ended @ cdecl pcap_lookupdev(ptr) wine_pcap_lookupdev @ cdecl pcap_lookupnet(str ptr ptr ptr) wine_pcap_lookupnet -@ stub pcap_loop +@ cdecl pcap_loop(ptr long ptr ptr) wine_pcap_loop @ cdecl pcap_major_version(ptr) wine_pcap_major_version @ cdecl pcap_minor_version(ptr) wine_pcap_minor_version @ stub pcap_next

1 0

André Hentschel : wpcap: Implement pcap_dispatch.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 927f8bee4669239408f8d44e5452014696c4f072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=927f8bee4669239408f8d44e5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 22:47:44 2014 +0200 wpcap: Implement pcap_dispatch. --- dlls/wpcap/wpcap.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 29aa08c..b80a4e0 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -1,7 +1,7 @@ /* * WPcap.dll Proxy. * - * Copyright 2011 André Hentschel + * Copyright 2011, 2014 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +19,8 @@ */ #include <pcap/pcap.h> +#include "windef.h" +#include "winbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wpcap); @@ -37,6 +39,40 @@ int CDECL wine_pcap_datalink(pcap_t *p) return pcap_datalink(p); } +typedef struct +{ + void (CALLBACK *pfn_cb)(u_char *, const struct pcap_pkthdr *, const u_char *); + void *user_data; +} PCAP_HANDLER_CALLBACK; + +static void pcap_handler_callback(u_char *user_data, const struct pcap_pkthdr *h, const u_char *p) +{ + PCAP_HANDLER_CALLBACK *pcb; + TRACE("(%p %p %p)\n", user_data, h, p); + pcb = (PCAP_HANDLER_CALLBACK *)user_data; + pcb->pfn_cb(pcb->user_data, h, p); + HeapFree(GetProcessHeap(), 0, pcb); + TRACE("Callback COMPLETED\n"); +} + +int CDECL wine_pcap_dispatch(pcap_t *p, int cnt, + void (CALLBACK *callback)(u_char *, const struct pcap_pkthdr *, const u_char *), + unsigned char *user) +{ + TRACE("(%p %i %p %p)\n", p, cnt, callback, user); + + if (callback) + { + PCAP_HANDLER_CALLBACK *pcb; + pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); + pcb->pfn_cb = callback; + pcb->user_data = user; + return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char*)pcb); + } + + return pcap_dispatch(p, cnt, NULL, user); +} + int CDECL wine_pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf) { int ret; diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 6dd67a1..92b5052 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -15,7 +15,7 @@ @ stub pcap_datalink_name_to_val @ stub pcap_datalink_val_to_description @ stub pcap_datalink_val_to_name -@ stub pcap_dispatch +@ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch @ stub pcap_dump @ stub pcap_dump_close @ stub pcap_dump_file

1 0

André Hentschel : wpcap: Implement pcap_snapshot.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: eaad4fea8912589d22fb6c9b6d894c37db06f31e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaad4fea8912589d22fb6c9b6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:54:03 2014 +0200 wpcap: Implement pcap_snapshot. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index f5402a4..29aa08c 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -118,6 +118,12 @@ int CDECL wine_pcap_setfilter(pcap_t *p, struct bpf_program *fp) return pcap_setfilter(p, fp); } +int CDECL wine_pcap_snapshot(pcap_t *p) +{ + TRACE("(%p)\n", p); + return pcap_snapshot(p); +} + int CDECL wine_pcap_stats(pcap_t *p, struct pcap_stat *ps) { TRACE("(%p %p)\n", p, ps); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 2af9197..6dd67a1 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -71,7 +71,7 @@ @ stub pcap_setnonblock @ stub pcap_setsampling @ stub pcap_setuserbuffer -@ stub pcap_snapshot +@ cdecl pcap_snapshot(ptr) wine_pcap_snapshot @ cdecl pcap_stats(ptr ptr) wine_pcap_stats @ stub pcap_stats_ex @ stub pcap_strerror

1 0

André Hentschel : wpcap: Implement pcap_freecode.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 03d067183f2789a215406b53e426c7ad5a4d8b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d067183f2789a215406b53e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:53:51 2014 +0200 wpcap: Implement pcap_freecode. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 4eedbd8..f5402a4 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -55,6 +55,12 @@ void CDECL wine_pcap_freealldevs(pcap_if_t *alldevs) pcap_freealldevs(alldevs); } +void CDECL wine_pcap_freecode(struct bpf_program *fp) +{ + TRACE("(%p)\n", fp); + return pcap_freecode(fp); +} + char* CDECL wine_pcap_geterr(pcap_t *p) { TRACE("(%p)\n", p); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index c0ba15e..2af9197 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -27,7 +27,7 @@ @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs @ stub pcap_findalldevs_ex @ cdecl pcap_freealldevs(ptr) wine_pcap_freealldevs -@ stub pcap_freecode +@ cdecl pcap_freecode(ptr) wine_pcap_freecode @ stub pcap_get_airpcap_handle @ cdecl pcap_geterr(ptr) wine_pcap_geterr @ stub pcap_getevent

1 0

André Hentschel : wpcap: Trace strings when possible.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: c180d522ae38b0a0ec5b8391bc1058c801594b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c180d522ae38b0a0ec5b8391b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:53:12 2014 +0200 wpcap: Trace strings when possible. --- dlls/wpcap/wpcap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 1a7f280..4eedbd8 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -27,7 +27,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); int CDECL wine_pcap_compile(pcap_t *p, struct bpf_program *program, const char *buf, int optimize, unsigned int mask) { - TRACE("(%p)\n", p); + TRACE("(%p %p %s %i %u)\n", p, program, debugstr_a(buf), optimize, mask); return pcap_compile(p, program, buf, optimize, mask); } @@ -77,7 +77,7 @@ char* CDECL wine_pcap_lookupdev(char *errbuf) int CDECL wine_pcap_lookupnet(const char *device, unsigned int *netp, unsigned int *maskp, char *errbuf) { - TRACE("(%p %p %p %p)\n", device, netp, maskp, errbuf); + TRACE("(%s %p %p %p)\n", debugstr_a(device), netp, maskp, errbuf); return pcap_lookupnet(device, netp, maskp, errbuf); } @@ -96,7 +96,7 @@ int CDECL wine_pcap_minor_version(pcap_t *p) pcap_t* CDECL wine_pcap_open_live(const char *source, int snaplen, int promisc, int to_ms, char *errbuf) { - TRACE("(%p %i %i %i %p)\n", source, snaplen, promisc, to_ms, errbuf); + TRACE("(%s %i %i %i %p)\n", debugstr_a(source), snaplen, promisc, to_ms, errbuf); return pcap_open_live(source, snaplen, promisc, to_ms, errbuf); }

1 0

André Hentschel : wpcap: Fix spec file to not print empty buffers.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: d1e780f2d2dc7b2f64e1dae264676e2c63725760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e780f2d2dc7b2f64e1dae26… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:52:27 2014 +0200 wpcap: Fix spec file to not print empty buffers. --- dlls/wpcap/wpcap.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 75a5bfd..c0ba15e 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -24,7 +24,7 @@ @ stub pcap_dump_open @ stub pcap_file @ stub pcap_fileno -@ cdecl pcap_findalldevs(ptr str) wine_pcap_findalldevs +@ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs @ stub pcap_findalldevs_ex @ cdecl pcap_freealldevs(ptr) wine_pcap_freealldevs @ stub pcap_freecode @@ -37,8 +37,8 @@ @ stub pcap_list_datalinks @ stub pcap_live_dump @ stub pcap_live_dump_ended -@ cdecl pcap_lookupdev(str) wine_pcap_lookupdev -@ cdecl pcap_lookupnet(str ptr ptr str) wine_pcap_lookupnet +@ cdecl pcap_lookupdev(ptr) wine_pcap_lookupdev +@ cdecl pcap_lookupnet(str ptr ptr ptr) wine_pcap_lookupnet @ stub pcap_loop @ cdecl pcap_major_version(ptr) wine_pcap_major_version @ cdecl pcap_minor_version(ptr) wine_pcap_minor_version @@ -49,7 +49,7 @@ @ stub pcap_offline_read @ stub pcap_open @ stub pcap_open_dead -@ cdecl pcap_open_live(str long long long str) wine_pcap_open_live +@ cdecl pcap_open_live(str long long long ptr) wine_pcap_open_live @ stub pcap_open_offline @ stub pcap_parsesrcstr @ stub pcap_perror

1 0

Henri Verbeet : wined3d: Store the amount of video memory as a UINT64.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 7cdaece711e696447b10ea9c0ab00b7ced799165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdaece711e696447b10ea9c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 18 08:26:20 2014 +0200 wined3d: Store the amount of video memory as a UINT64. --- dlls/wined3d/device.c | 9 +++++---- dlls/wined3d/directx.c | 28 +++++++++++++++------------- dlls/wined3d/wined3d_private.h | 8 ++++---- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 54273cd..b7d02bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1138,11 +1138,12 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device { TRACE("device %p.\n", device); - TRACE("Emulating %d MB, returning %d MB left.\n", - device->adapter->TextureRam / (1024 * 1024), - (device->adapter->TextureRam - device->adapter->UsedTextureRam) / (1024 * 1024)); + TRACE("Emulating 0x%s bytes. 0x%s used, returning 0x%s left.\n", + wine_dbgstr_longlong(device->adapter->vram_bytes), + wine_dbgstr_longlong(device->adapter->vram_bytes_used), + wine_dbgstr_longlong(device->adapter->vram_bytes - device->adapter->vram_bytes_used)); - return device->adapter->TextureRam - device->adapter->UsedTextureRam; + return min(UINT_MAX, device->adapter->vram_bytes - device->adapter->vram_bytes_used); } void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d1eeee8..f1ba7b5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -409,11 +409,13 @@ fail: } /* Adjust the amount of used texture memory */ -unsigned int adapter_adjust_memory(struct wined3d_adapter *adapter, int amount) +UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) { - adapter->UsedTextureRam += amount; - TRACE("Adjusted adapter memory by %d to %d.\n", amount, adapter->UsedTextureRam); - return adapter->UsedTextureRam; + adapter->vram_bytes_used += amount; + TRACE("Adjusted used adapter memory by 0x%s to 0x%s.\n", + wine_dbgstr_longlong(amount), + wine_dbgstr_longlong(adapter->vram_bytes_used)); + return adapter->vram_bytes_used; } static void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) @@ -1498,21 +1500,21 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, if ((gpu_desc = get_gpu_description(driver_info->vendor, driver_info->device))) { driver_info->description = gpu_desc->description; - driver_info->vidmem = gpu_desc->vidmem * 1024 * 1024; + driver_info->vram_bytes = (UINT64)gpu_desc->vidmem * 1024 * 1024; driver = gpu_desc->driver; } else { ERR("Card %04x:%04x not found in driver DB.\n", vendor, device); driver_info->description = "Direct3D HAL"; - driver_info->vidmem = WINE_DEFAULT_VIDMEM; + driver_info->vram_bytes = WINE_DEFAULT_VIDMEM; driver = DRIVER_UNKNOWN; } if (wined3d_settings.emulated_textureram) { TRACE("Overriding amount of video memory with %u bytes.\n", wined3d_settings.emulated_textureram); - driver_info->vidmem = wined3d_settings.emulated_textureram; + driver_info->vram_bytes = wined3d_settings.emulated_textureram; } /* Try to obtain driver version information for the current Windows version. This fails in @@ -3401,7 +3403,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, memcpy(&identifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(identifier->device_identifier)); identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; memcpy(&identifier->adapter_luid, &adapter->luid, sizeof(identifier->adapter_luid)); - identifier->video_memory = adapter->TextureRam; + identifier->video_memory = min(~(SIZE_T)0, adapter->vram_bytes); return WINED3D_OK; } @@ -5104,9 +5106,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) return FALSE; } - adapter->TextureRam = adapter->driver_info.vidmem; - adapter->UsedTextureRam = 0; - TRACE("Emulating %u MB of texture ram.\n", adapter->TextureRam / (1024 * 1024)); + adapter->vram_bytes = adapter->driver_info.vram_bytes; + adapter->vram_bytes_used = 0; + TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); display_device.cb = sizeof(display_device); EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); @@ -5132,9 +5134,9 @@ static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordi adapter->driver_info.name = "Display"; adapter->driver_info.description = "WineD3D DirectDraw Emulation"; if (wined3d_settings.emulated_textureram) - adapter->TextureRam = wined3d_settings.emulated_textureram; + adapter->vram_bytes = wined3d_settings.emulated_textureram; else - adapter->TextureRam = 128 * 1024 * 1024; + adapter->vram_bytes = 128 * 1024 * 1024; initPixelFormatsNoGL(&adapter->gl_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a9d81a5c..ebe0bf8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1634,7 +1634,7 @@ struct wined3d_driver_info enum wined3d_pci_device device; const char *name; const char *description; - unsigned int vidmem; + UINT64 vram_bytes; DWORD version_high; DWORD version_low; }; @@ -1683,8 +1683,8 @@ struct wined3d_adapter WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ unsigned int cfg_count; struct wined3d_pixel_format *cfgs; - unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */ - unsigned int UsedTextureRam; + UINT64 vram_bytes; + UINT64 vram_bytes_used; LUID luid; const struct wined3d_vertex_pipe_ops *vertex_pipe; @@ -1694,7 +1694,7 @@ struct wined3d_adapter }; BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; -unsigned int adapter_adjust_memory(struct wined3d_adapter *adapter, int amount) DECLSPEC_HIDDEN; +UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; extern void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3d9: wined3d_device_get_available_texture_mem() returns a UINT.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 888b278096cd773241cad9a107314c22addaa53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=888b278096cd773241cad9a10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 18 08:26:19 2014 +0200 d3d9: wined3d_device_get_available_texture_mem() returns a UINT. --- dlls/d3d9/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1117138..7d41e4e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -343,15 +343,15 @@ static HRESULT WINAPI d3d9_device_TestCooperativeLevel(IDirect3DDevice9Ex *iface static UINT WINAPI d3d9_device_GetAvailableTextureMem(IDirect3DDevice9Ex *iface) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + UINT ret; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_device_get_available_texture_mem(device->wined3d_device); + ret = wined3d_device_get_available_texture_mem(device->wined3d_device); wined3d_mutex_unlock(); - return hr; + return ret; } static HRESULT WINAPI d3d9_device_EvictManagedResources(IDirect3DDevice9Ex *iface)

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
31
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 2014