wine-commits September 2015

wine-commits@winehq.org

2 participants
318 discussions

Dmitry Timoshkov : msscript.ocx: Add missing 'vararg' attribute to the Run () methods.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: b6520ef6e7135c34a221c9efa88f09441a12c60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6520ef6e7135c34a221c9efa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 4 15:24:17 2015 +0800 msscript.ocx: Add missing 'vararg' attribute to the Run() methods. --- dlls/msscript.ocx/msscript.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.idl b/dlls/msscript.ocx/msscript.idl index 5090c8f..efc00ff 100644 --- a/dlls/msscript.ocx/msscript.idl +++ b/dlls/msscript.ocx/msscript.idl @@ -103,7 +103,7 @@ library MSScriptControl [id(0x07d2)] HRESULT ExecuteStatement([in] BSTR Statement); - [id(0x07d3)] + [id(0x07d3), vararg] HRESULT Run( [in] BSTR ProcedureName, [in] SAFEARRAY(VARIANT) *Parameters, @@ -234,7 +234,7 @@ library MSScriptControl [id(0x07d2)] HRESULT ExecuteStatement([in] BSTR Statement); - [id(0x07d3)] + [id(0x07d3), vararg] HRESULT Run( [in] BSTR ProcedureName, [in] SAFEARRAY(VARIANT) *Parameters,

1 0

Gerald Pfeifer : rpcrt4/tests: Cast to ULONGLONG instead of LONGLONG to avoid shift overflow.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: e6ca322fb15e09e9a4fcc37db86d21f4257e2fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ca322fb15e09e9a4fcc37db… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Sep 4 00:39:24 2015 +0200 rpcrt4/tests: Cast to ULONGLONG instead of LONGLONG to avoid shift overflow. --- dlls/rpcrt4/tests/ndr_marshall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d6befe5..aeecf8c 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -965,7 +965,7 @@ static void test_simple_struct(void) s1.c = 0xa5; s1.l1 = 0xdeadbeef; s1.l2 = 0xcafebabe; - s1.ll = ((LONGLONG) 0xbadefeed << 32) | 0x2468ace0; + s1.ll = ((ULONGLONG) 0xbadefeed << 32) | 0x2468ace0; wiredatalen = 24; memcpy(wiredata, &s1, wiredatalen);

1 0

Bruno Jesus : quartz: Skip AVI bad chunks while looking for the LIST chunk.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: c49e9d085d905cdb2aac021dfefad7bc3f409b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c49e9d085d905cdb2aac021df… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 3 23:12:58 2015 +0800 quartz: Skip AVI bad chunks while looking for the LIST chunk. --- dlls/quartz/avisplit.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 6059511..d62ec2b 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1109,24 +1109,18 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, return E_FAIL; } - pos += sizeof(RIFFCHUNK) + list.cb; - hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); - - while (list.fcc == ckidAVIPADDING || (list.fcc == FOURCC_LIST && list.fccListType != listtypeAVIMOVIE)) + /* Skip any chunks until we find the LIST chunk */ + do { pos += sizeof(RIFFCHUNK) + list.cb; - hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); } + while (hr == S_OK && (list.fcc != FOURCC_LIST || + (list.fcc == FOURCC_LIST && list.fccListType != listtypeAVIMOVIE))); - if (list.fcc != FOURCC_LIST) - { - ERR("Expected LIST, but got %.04s\n", (LPSTR)&list.fcc); - return E_FAIL; - } - if (list.fccListType != listtypeAVIMOVIE) + if (hr != S_OK) { - ERR("Expected AVI movie list, but got %.04s\n", (LPSTR)&list.fccListType); + ERR("Failed to find LIST chunk from AVI file\n"); return E_FAIL; } @@ -1134,21 +1128,18 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, /* FIXME: AVIX files are extended beyond the FOURCC chunk "AVI ", and thus won't be played here, * once I get one of the files I'll try to fix it */ - if (hr == S_OK) - { - This->rtStart = pAviSplit->CurrentChunkOffset = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFLIST)); - pos += list.cb + sizeof(RIFFCHUNK); - - pAviSplit->EndOfFile = This->rtStop = MEDIATIME_FROM_BYTES(pos); - if (pos > total) - { - ERR("File smaller (%x%08x) then EndOfFile (%x%08x)\n", (DWORD)(total >> 32), (DWORD)total, (DWORD)(pAviSplit->EndOfFile >> 32), (DWORD)pAviSplit->EndOfFile); - return E_FAIL; - } + This->rtStart = pAviSplit->CurrentChunkOffset = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFLIST)); + pos += list.cb + sizeof(RIFFCHUNK); - hr = IAsyncReader_SyncRead(This->pReader, BYTES_FROM_MEDIATIME(pAviSplit->CurrentChunkOffset), sizeof(pAviSplit->CurrentChunk), (BYTE *)&pAviSplit->CurrentChunk); + pAviSplit->EndOfFile = This->rtStop = MEDIATIME_FROM_BYTES(pos); + if (pos > total) + { + ERR("File smaller (%x%08x) then EndOfFile (%x%08x)\n", (DWORD)(total >> 32), (DWORD)total, (DWORD)(pAviSplit->EndOfFile >> 32), (DWORD)pAviSplit->EndOfFile); + return E_FAIL; } + hr = IAsyncReader_SyncRead(This->pReader, BYTES_FROM_MEDIATIME(pAviSplit->CurrentChunkOffset), sizeof(pAviSplit->CurrentChunk), (BYTE *)&pAviSplit->CurrentChunk); + props->cbAlign = 1; props->cbPrefix = 0; /* Comrades, prevent shortage of buffers, or you will feel the consequences! DA! */

1 0

Nikolay Sivov : dwrite: Make sure same files are scanned once when building font collection.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: b4ce95c1ab06ec57dd240d3501974db97ae73684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ce95c1ab06ec57dd240d350… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 3 23:52:22 2015 +0300 dwrite: Make sure same files are scanned once when building font collection. --- dlls/dwrite/font.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index baa5ace..a181395 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2866,7 +2866,13 @@ static void fontfamily_add_oblique_simulated_face(struct dwrite_fontfamily_data HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerator *enumerator, BOOL is_system, IDWriteFontCollection **ret) { + struct fontfile_enum { + struct list entry; + IDWriteFontFile *file; + }; + struct fontfile_enum *fileenum, *fileenum2; struct dwrite_fontcollection *collection; + struct list scannedfiles; BOOL current = FALSE; HRESULT hr = S_OK; UINT32 i; @@ -2886,12 +2892,13 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat TRACE("building font collection:\n"); + list_init(&scannedfiles); while (hr == S_OK) { DWRITE_FONT_FACE_TYPE face_type; DWRITE_FONT_FILE_TYPE file_type; + BOOL supported, same = FALSE; IDWriteFontFile *file; UINT32 face_count; - BOOL supported; current = FALSE; hr = IDWriteFontFileEnumerator_MoveNext(enumerator, &current); @@ -2902,6 +2909,17 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat if (FAILED(hr)) break; + /* check if we've scanned this file already */ + LIST_FOR_EACH_ENTRY(fileenum, &scannedfiles, struct fontfile_enum, entry) { + if ((same = is_same_fontfile(fileenum->file, file))) + break; + } + + if (same) { + IDWriteFontFile_Release(file); + continue; + } + /* failed font files are skipped */ hr = IDWriteFontFile_Analyze(file, &supported, &file_type, &face_type, &face_count); if (FAILED(hr) || !supported || face_count == 0) { @@ -2911,6 +2929,11 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat continue; } + /* add to scanned list */ + fileenum = heap_alloc(sizeof(*fileenum)); + fileenum->file = file; + list_add_tail(&scannedfiles, &fileenum->entry); + for (i = 0; i < face_count; i++) { IDWriteLocalizedStrings *family_name = NULL; struct dwrite_font_data *font_data; @@ -2948,8 +2971,12 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat if (FAILED(hr)) break; } + } - IDWriteFontFile_Release(file); + LIST_FOR_EACH_ENTRY_SAFE(fileenum, fileenum2, &scannedfiles, struct fontfile_enum, entry) { + IDWriteFontFile_Release(fileenum->file); + list_remove(&fileenum->entry); + heap_free(fileenum); } for (i = 0; i < collection->family_count; i++) {

1 0

Vincent Povirk : mscoree: Don't modify the PATH environment variable.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: 6df7366e4e4a0342ba347be054bc66565b13ca64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df7366e4e4a0342ba347be05… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 3 15:44:24 2015 -0500 mscoree: Don't modify the PATH environment variable. Wine Mono 4.5.4 eliminated the need for this. --- dlls/mscoree/metahost.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index fb0068d..5e32ecb 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -111,21 +111,6 @@ static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char static void mono_shutdown_callback_fn(MonoProfiler *prof); -static void set_environment(LPCWSTR bin_path) -{ - WCHAR path_env[MAX_PATH]; - int len; - - static const WCHAR pathW[] = {'P','A','T','H',0}; - - /* We have to modify PATH as Mono loads other DLLs from this directory. */ - GetEnvironmentVariableW(pathW, path_env, sizeof(path_env)/sizeof(WCHAR)); - len = strlenW(path_env); - path_env[len++] = ';'; - strcpyW(path_env+len, bin_path); - SetEnvironmentVariableW(pathW, path_env); -} - static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) { @@ -139,10 +124,9 @@ static void missing_runtime_message(void) static HRESULT load_mono(LPCWSTR mono_path) { - static const WCHAR bin[] = {'\\','b','i','n',0}; static const WCHAR lib[] = {'\\','l','i','b',0}; static const WCHAR etc[] = {'\\','e','t','c',0}; - WCHAR mono_dll_path[MAX_PATH+16], mono_bin_path[MAX_PATH+4]; + WCHAR mono_dll_path[MAX_PATH+16]; WCHAR mono_lib_path[MAX_PATH+4], mono_etc_path[MAX_PATH+4]; char mono_lib_path_a[MAX_PATH], mono_etc_path_a[MAX_PATH]; int trace_size; @@ -158,10 +142,6 @@ static HRESULT load_mono(LPCWSTR mono_path) if (!mono_handle) { - strcpyW(mono_bin_path, mono_path); - strcatW(mono_bin_path, bin); - set_environment(mono_bin_path); - strcpyW(mono_lib_path, mono_path); strcatW(mono_lib_path, lib); WideCharToMultiByte(CP_UTF8, 0, mono_lib_path, -1, mono_lib_path_a, MAX_PATH, NULL, NULL);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: 4e82a2ea1c9c3d07bba7301af4392647803d81dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e82a2ea1c9c3d07bba7301af… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Sep 3 22:55:49 2015 +0300 po: Update Finnish translation. --- po/fi.po | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/po/fi.po b/po/fi.po index 213ba69..0c7fb6a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9904,14 +9904,12 @@ msgstr "" "/i Käynnistä ohjelma tuoreilla ympäristömuuttujilla.\n" "/min Käynnistä ohjelma pienennettynä.\n" "/max Käynnistä ohjelma suurennettuna.\n" -"/low Käynnistä ohjelma matalassa prioriteettiluokassa.\n" -"/normal Käynnistä ohjelma normaalissa prioriteettiluokassa.\n" -"/high Käynnistä ohjelma korkeassa prioriteettiluokassa.\n" -"/realtime Käynnistä ohjelma reaaliaikaisessa prioriteettiluokassa.\n" -"/abovenormal Käynnistä ohjelma normaalia korkeammassa\n" -" prioriteettiluokassa.\n" -"/belownormal Käynnistä ohjelma normaalia matalammassa\n" -" prioriteettiluokassa.\n" +"/low Käynnistä ohjelma prioriteetilla 'matala'.\n" +"/normal Käynnistä ohjelma prioriteetilla 'normaali'.\n" +"/high Käynnistä ohjelma prioriteetilla 'korkea'.\n" +"/realtime Käynnistä ohjelma prioriteetilla 'reaaliaikainen'.\n" +"/abovenormal Käynnistä ohjelma prioriteetilla 'normaalia korkeampi'.\n" +"/belownormal Käynnistä ohjelma prioriteetilla 'normaalia matalampi'.\n" "/node n Käynnistä ohjelma määrätyllä NUMA-solmulla.\n" "/affinity peite Käynnistä ohjelma määrätyllä affiniteettipeitteellä.\n" "/wait Odota, että ohjelma sulkeutuu, ja palauta sen paluuarvo.\n" @@ -12829,18 +12827,16 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "uninstaller: Ei löydy ohjelmaa, jonka GUID olisi '%1'\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" -msgstr "" +msgstr "uninstaller: Valitsinta '--remove' täytyy seurata ohjelman GUID\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Virhe: Viallinen vaihtoehto '%c'.\n" +msgstr "uninstaller: Virheellinen valitsin [%1]\n" #: uninstaller.rc:35 msgid "" @@ -12849,6 +12845,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Winen ohjelmanpoistaja\n" +"\n" +"Poista ohjelmia nykyisestä Wine-prefiksistä.\n" +"\n" #: uninstaller.rc:43 msgid "" @@ -12863,6 +12863,16 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"Käyttö:\n" +" uninstaller [valitsimet]\n" +"\n" +"Valitsimet:\n" +" --help\t Näytä tämä viesti.\n" +" --list\t Listaa tähän Wine-prefiksiin asennetut ohjelmat.\n" +" --remove {GUID} Poista valittu ohjelma.\n" +"\t\t Käytä valitsinta '--list' GUIDin löytämiseen.\n" +" [ei valitsinta] Käynnistä tämän ohjelman graafinen versio.\n" +"\n" #: view.rc:36 msgid "&Pan"

1 0

Stefan Dösinger : d3d8/tests: Add more GetBackBuffer error handling tests.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: 76c43d817746bb9c81b36e0d0bec4bb0b2ffbdbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c43d817746bb9c81b36e0d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 3 12:52:55 2015 +0200 d3d8/tests: Add more GetBackBuffer error handling tests. --- dlls/d3d8/tests/device.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 660e202..47326b5 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -280,6 +280,12 @@ static void test_swapchain(void) goto cleanup; } + backbuffer = (void *)0xdeadbeef; + /* IDirect3DDevice8::GetBackBuffer crashes if a NULL output pointer is passed. */ + hr = IDirect3DDevice8_GetBackBuffer(device, 1, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!backbuffer, "The back buffer pointer is %p, expected NULL.\n", backbuffer); + memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; @@ -300,6 +306,9 @@ static void test_swapchain(void) ok(SUCCEEDED(hr), "Failed to create a swapchain (%#08x)\n", hr); if(SUCCEEDED(hr)) { /* Swapchain 3, created with backbuffercount 2 */ + hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 0, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + backbuffer = (void *) 0xdeadbeef; hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 0, 0, &backbuffer); ok(SUCCEEDED(hr), "Failed to get the 1st back buffer (%#08x)\n", hr);

1 0

Stefan Dösinger : d3d9/tests: Add more GetBackBuffer error handling tests.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: fc987aaaf6ceac1f66c5e41255d7fd425413a705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc987aaaf6ceac1f66c5e4125… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 3 12:52:54 2015 +0200 d3d9/tests: Add more GetBackBuffer error handling tests. --- dlls/d3d9/tests/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d1a8d37..c41a5e6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1085,6 +1085,18 @@ static void test_swapchain(void) ok(d3dpp.BackBufferCount == 1, "Got unexpected back buffer count %u.\n", d3dpp.BackBufferCount); IDirect3DSwapChain9_Release(swapchain0); + hr = IDirect3DSwapChain9_GetBackBuffer(swapchain0, 0, D3DBACKBUFFER_TYPE_MONO, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + /* IDirect3DDevice9::GetBackBuffer crashes if a NULL output pointer is passed. */ + backbuffer = (void *)0xdeadbeef; + hr = IDirect3DDevice9_GetBackBuffer(device, 1, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!backbuffer, "The back buffer pointer is %p, expected NULL.\n", backbuffer); + backbuffer = (void *)0xdeadbeef; + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 1, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!backbuffer, "The back buffer pointer is %p, expected NULL.\n", backbuffer); + /* Check if there is a back buffer */ hr = IDirect3DSwapChain9_GetBackBuffer(swapchain0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(SUCCEEDED(hr), "Failed to get the back buffer (%08x)\n", hr);

1 0

Stefan Dösinger : wined3d: Remove wined3d_device_get_back_buffer.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: feb35006f514c48fbda6b0609d1ac36e889746a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb35006f514c48fbda6b0609… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 3 12:52:53 2015 +0200 wined3d: Remove wined3d_device_get_back_buffer. --- dlls/d3d8/device.c | 33 +++++++++++++++++++++++---------- dlls/d3d9/device.c | 35 +++++++++++++++++++++++++---------- dlls/wined3d/device.c | 20 -------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 -- 5 files changed, 48 insertions(+), 43 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8200119..336a07c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -724,25 +724,38 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface8 **backbuffer) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - struct wined3d_surface *wined3d_surface = NULL; + struct wined3d_swapchain *swapchain; + struct wined3d_resource *wined3d_resource; + struct wined3d_texture *wined3d_texture; struct d3d8_surface *surface_impl; - HRESULT hr; TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, backbuffer_idx, backbuffer_type, backbuffer); + /* No need to check for backbuffer == NULL, Windows crashes in that case. */ wined3d_mutex_lock(); - hr = wined3d_device_get_back_buffer(device->wined3d_device, 0, backbuffer_idx, - (enum wined3d_backbuffer_type)backbuffer_type, &wined3d_surface); - if (SUCCEEDED(hr) && wined3d_surface && backbuffer) + if (!(swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0))) { - surface_impl = wined3d_surface_get_parent(wined3d_surface); - *backbuffer = &surface_impl->IDirect3DSurface8_iface; - IDirect3DSurface8_AddRef(*backbuffer); + wined3d_mutex_unlock(); + *backbuffer = NULL; + return D3DERR_INVALIDCALL; } - wined3d_mutex_unlock(); - return hr; + if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain, + backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) + { + wined3d_mutex_unlock(); + *backbuffer = NULL; + return D3DERR_INVALIDCALL; + } + + wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + surface_impl = wined3d_resource_get_parent(wined3d_resource); + *backbuffer = &surface_impl->IDirect3DSurface8_iface; + IDirect3DSurface8_AddRef(*backbuffer); + + wined3d_mutex_unlock(); + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetRasterStatus(IDirect3DDevice8 *iface, D3DRASTER_STATUS *raster_status) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 95d1e02..5640bdd 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -746,26 +746,41 @@ static HRESULT WINAPI d3d9_device_GetBackBuffer(IDirect3DDevice9Ex *iface, UINT UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface9 **backbuffer) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - struct wined3d_surface *wined3d_surface = NULL; + struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_resource *wined3d_resource; + struct wined3d_texture *wined3d_texture; struct d3d9_surface *surface_impl; - HRESULT hr; TRACE("iface %p, swapchain %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, swapchain, backbuffer_idx, backbuffer_type, backbuffer); + /* No need to check for backbuffer == NULL, Windows crashes in that case. */ wined3d_mutex_lock(); - hr = wined3d_device_get_back_buffer(device->wined3d_device, swapchain, - backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type, &wined3d_surface); - if (SUCCEEDED(hr) && wined3d_surface && backbuffer) + + if (!(wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, swapchain))) { - surface_impl = wined3d_surface_get_parent(wined3d_surface); - *backbuffer = &surface_impl->IDirect3DSurface9_iface; - IDirect3DSurface9_AddRef(*backbuffer); + wined3d_mutex_unlock(); + *backbuffer = NULL; + return D3DERR_INVALIDCALL; } - wined3d_mutex_unlock(); - return hr; + if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(wined3d_swapchain, + backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) + { + wined3d_mutex_unlock(); + *backbuffer = NULL; + return D3DERR_INVALIDCALL; + } + + wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + surface_impl = wined3d_resource_get_parent(wined3d_resource); + *backbuffer = &surface_impl->IDirect3DSurface9_iface; + IDirect3DSurface9_AddRef(*backbuffer); + + wined3d_mutex_unlock(); + return D3D_OK; } + static HRESULT WINAPI d3d9_device_GetRasterStatus(IDirect3DDevice9Ex *iface, UINT swapchain, D3DRASTER_STATUS *raster_status) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dcc5d37..765af0d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3183,26 +3183,6 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d return device->state.textures[stage]; } -HRESULT CDECL wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx, - UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type, struct wined3d_surface **backbuffer) -{ - struct wined3d_texture *texture; - struct wined3d_resource *resource; - struct wined3d_swapchain *swapchain; - - TRACE("device %p, swapchain_idx %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", - device, swapchain_idx, backbuffer_idx, backbuffer_type, backbuffer); - - if (!(swapchain = wined3d_device_get_swapchain(device, swapchain_idx))) - return WINED3DERR_INVALIDCALL; - - if (!(texture = wined3d_swapchain_get_back_buffer(swapchain, backbuffer_idx, backbuffer_type))) - return WINED3DERR_INVALIDCALL; - resource = wined3d_texture_get_sub_resource(texture, 0); - *backbuffer = wined3d_surface_from_resource(resource); - return WINED3D_OK; -} - HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps) { TRACE("device %p, caps %p.\n", device, caps); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4710f51..9f714ef 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -49,7 +49,6 @@ @ cdecl wined3d_device_end_stateblock(ptr ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) -@ cdecl wined3d_device_get_back_buffer(ptr long long long ptr) @ cdecl wined3d_device_get_base_vertex_index(ptr) @ cdecl wined3d_device_get_clip_plane(ptr long ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 41384b5..72a41b2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2154,8 +2154,6 @@ HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); -HRESULT __cdecl wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx, - UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type, struct wined3d_surface **backbuffer); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, struct wined3d_vec4 *plane);

1 0

Stefan Dösinger : wined3d: Return a texture from wined3d_swapchain_get_back_buffer.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: f010e5d88a91f0c6a66ff51d9b26930f1fa0753d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f010e5d88a91f0c6a66ff51d9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 3 12:52:52 2015 +0200 wined3d: Return a texture from wined3d_swapchain_get_back_buffer. --- dlls/d3d8/swapchain.c | 15 ++++++++++++--- dlls/d3d9/swapchain.c | 19 ++++++++++++++----- dlls/dxgi/swapchain.c | 12 ++++++------ dlls/wined3d/device.c | 6 +++++- dlls/wined3d/swapchain.c | 4 ++-- include/wine/wined3d.h | 2 +- 6 files changed, 40 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 44fc02a..70b7fb0 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -112,23 +112,32 @@ static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface8 **backbuffer) { struct d3d8_swapchain *swapchain = impl_from_IDirect3DSwapChain8(iface); - struct wined3d_surface *wined3d_surface = NULL; + struct wined3d_resource *wined3d_resource; + struct wined3d_texture *wined3d_texture; struct d3d8_surface *surface_impl; HRESULT hr = D3D_OK; TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, backbuffer_idx, backbuffer_type, backbuffer); + if (!backbuffer) + { + WARN("The output pointer is NULL, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); - if ((wined3d_surface = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, + if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) { - surface_impl = wined3d_surface_get_parent(wined3d_surface); + wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + surface_impl = wined3d_resource_get_parent(wined3d_resource); *backbuffer = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*backbuffer); } else { + /* Do not set *backbuffer = NULL, see tests/device.c, test_swapchain(). */ hr = D3DERR_INVALIDCALL; } wined3d_mutex_unlock(); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 5cf56d2..b26a482 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -152,23 +152,32 @@ static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface9 **backbuffer) { struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); - struct wined3d_surface *wined3d_surface = NULL; + struct wined3d_resource *wined3d_resource; + struct wined3d_texture *wined3d_texture; struct d3d9_surface *surface_impl; HRESULT hr = D3D_OK; TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", iface, backbuffer_idx, backbuffer_type, backbuffer); + if (!backbuffer) + { + WARN("The output pointer is NULL, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_lock(); - if ((wined3d_surface = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, + if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type))) { - surface_impl = wined3d_surface_get_parent(wined3d_surface); - *backbuffer = &surface_impl->IDirect3DSurface9_iface; - IDirect3DSurface9_AddRef(*backbuffer); + wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + surface_impl = wined3d_resource_get_parent(wined3d_resource); + *backbuffer = &surface_impl->IDirect3DSurface9_iface; + IDirect3DSurface9_AddRef(*backbuffer); } else { + /* Do not set *backbuffer = NULL, see tests/device.c, test_swapchain(). */ hr = D3DERR_INVALIDCALL; } wined3d_mutex_unlock(); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ce09450..10ae26d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -143,7 +143,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, UINT buffer_idx, REFIID riid, void **surface) { struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface); - struct wined3d_surface *backbuffer; + struct wined3d_texture *texture; IUnknown *parent; HRESULT hr; @@ -152,14 +152,14 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, EnterCriticalSection(&dxgi_cs); - if (!(backbuffer = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, + if (!(texture = wined3d_swapchain_get_back_buffer(This->wined3d_swapchain, buffer_idx, WINED3D_BACKBUFFER_TYPE_MONO))) { LeaveCriticalSection(&dxgi_cs); return DXGI_ERROR_INVALID_CALL; } - parent = wined3d_surface_get_parent(backbuffer); + parent = wined3d_texture_get_parent(texture); hr = IUnknown_QueryInterface(parent, riid, surface); LeaveCriticalSection(&dxgi_cs); @@ -220,7 +220,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeBuffers(IDXGISwapChain *if { struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); struct wined3d_swapchain_desc wined3d_desc; - struct wined3d_surface *surface; + struct wined3d_texture *texture; IUnknown *parent; unsigned int i; HRESULT hr; @@ -235,9 +235,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeBuffers(IDXGISwapChain *if wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); for (i = 0; i < wined3d_desc.backbuffer_count; ++i) { - surface = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, + texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, i, WINED3D_BACKBUFFER_TYPE_MONO); - parent = wined3d_surface_get_parent(surface); + parent = wined3d_texture_get_parent(texture); IUnknown_AddRef(parent); if (IUnknown_Release(parent)) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f8b9666..dcc5d37 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3186,6 +3186,8 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d HRESULT CDECL wined3d_device_get_back_buffer(const struct wined3d_device *device, UINT swapchain_idx, UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type, struct wined3d_surface **backbuffer) { + struct wined3d_texture *texture; + struct wined3d_resource *resource; struct wined3d_swapchain *swapchain; TRACE("device %p, swapchain_idx %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", @@ -3194,8 +3196,10 @@ HRESULT CDECL wined3d_device_get_back_buffer(const struct wined3d_device *device if (!(swapchain = wined3d_device_get_swapchain(device, swapchain_idx))) return WINED3DERR_INVALIDCALL; - if (!(*backbuffer = wined3d_swapchain_get_back_buffer(swapchain, backbuffer_idx, backbuffer_type))) + if (!(texture = wined3d_swapchain_get_back_buffer(swapchain, backbuffer_idx, backbuffer_type))) return WINED3DERR_INVALIDCALL; + resource = wined3d_texture_get_sub_resource(texture, 0); + *backbuffer = wined3d_surface_from_resource(resource); return WINED3D_OK; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 70f5d5c..600c9bd 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -177,7 +177,7 @@ HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapc return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT); } -struct wined3d_surface * CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, +struct wined3d_texture * CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, UINT back_buffer_idx, enum wined3d_backbuffer_type type) { TRACE("swapchain %p, back_buffer_idx %u, type %#x.\n", @@ -198,7 +198,7 @@ struct wined3d_surface * CDECL wined3d_swapchain_get_back_buffer(const struct wi TRACE("Returning back buffer %p.\n", swapchain->back_buffers[back_buffer_idx]); - return surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[back_buffer_idx], 0)); + return swapchain->back_buffers[back_buffer_idx]; } HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8970cd5..41384b5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2513,7 +2513,7 @@ HRESULT __cdecl wined3d_surface_update_overlay_z_order(struct wined3d_surface *s HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); ULONG __cdecl wined3d_swapchain_decref(struct wined3d_swapchain *swapchain); -struct wined3d_surface * __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, +struct wined3d_texture * __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type); struct wined3d_device * __cdecl wined3d_swapchain_get_device(const struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain,

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
32
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 September 2015