wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Rico Schüller : wineusr: Remove frankscorner.org.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: docs Branch: master Commit: 565b95f6e002a4f01f9c21bc4b6a2fabef4f4b90 URL: http://source.winehq.org/git/docs.git/?a=commit;h=565b95f6e002a4f01f9c21bc4… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 3 17:18:46 2013 +0100 wineusr: Remove frankscorner.org. --- en/wineusr-bugs.sgml | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 06b48be..b7df91e 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -134,14 +134,6 @@ </listitem> <listitem> <para> - <ulink url="http://www.frankscorner.org">Frank's Corner</ulink> - contains a list of applications and detailed instructions - for setting them up. Further help can be found in the user - forums. - </para> - </listitem> - <listitem> - <para> <ulink url="http://www.google.com">Google</ulink> can be useful depending on how you use it. You may find it helpful to search

1 0

Rico Schüller : wineusr: Fix wineusr-configuring.sgml.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: docs Branch: master Commit: 5ceebe607b8d58c416b71edc3c8fb6fd11a08fee URL: http://source.winehq.org/git/docs.git/?a=commit;h=5ceebe607b8d58c416b71edc3… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 3 17:18:37 2013 +0100 wineusr: Fix wineusr-configuring.sgml. --- en/wineusr-configuring.sgml | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 2d3fc9c..ddc896e 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -219,14 +219,15 @@ this file is a publicly available DLL or a custom DLL belonging to your program. In the latter case, check that you have installed your program correctly. + </para> <para> Most often applications will assume that a required redistributable package has already been installed and subsequently fail to run when the required dependencies are not met. For example: - <para> - <programlisting>err:module:import_dll Library MFC42.DLL (which is needed by L"C:\\Program Files\\Foo\\Bar.dll") not found</programlisting> - <para> </para> + <programlisting> + err:module:import_dll Library MFC42.DLL (which is needed by L"C:\\Program Files\\Foo\\Bar.dll") not found + </programlisting> <para> Redistributable packages which install the necessary runtimes can be obtained through the use of <ulink url="http://wiki.winehq.org/winetricks">

1 0

Rico Schüller : winedev: Fix winedev-testing.sgml.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: docs Branch: master Commit: 01e869a3771652ed8c2aa496973515e56c67f347 URL: http://source.winehq.org/git/docs.git/?a=commit;h=01e869a3771652ed8c2aa4969… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 3 17:18:19 2013 +0100 winedev: Fix winedev-testing.sgml. --- en/winedev-testing.sgml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index ccd1020..2f5dcab 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -206,6 +206,7 @@ thread.c: 86 tests executed, 5 marked as todo, 0 failures. </para> <para> Run <command>yum install mingw32-gcc</>. + </para> </sect3> <sect3> <title>*BSD</title>

1 0

Jacek Caban : urlmon: Added support for 'Run' setup hook.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: 6f4c5f1dd8c350d2c434edf947d50248ab3386f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4c5f1dd8c350d2c434edf94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 4 14:45:48 2013 +0100 urlmon: Added support for 'Run' setup hook. --- dlls/urlmon/axinstall.c | 132 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 129 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index 9f53ce0..ca1aef6 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -142,6 +142,134 @@ static HRESULT setup_dll(install_ctx_t *ctx) return hres; } +static void expand_command(install_ctx_t *ctx, const WCHAR *cmd, WCHAR *buf, size_t *size) +{ + const WCHAR *ptr = cmd, *prev_ptr = cmd; + size_t len = 0, len2; + + static const WCHAR expand_dirW[] = {'%','E','X','T','R','A','C','T','_','D','I','R','%'}; + + while((ptr = strchrW(ptr, '%'))) { + if(buf) + memcpy(buf+len, prev_ptr, ptr-prev_ptr); + len += ptr-prev_ptr; + + if(!strncmpiW(ptr, expand_dirW, sizeof(expand_dirW)/sizeof(WCHAR))) { + len2 = strlenW(ctx->tmp_dir); + if(buf) + memcpy(buf+len, ctx->tmp_dir, len2*sizeof(WCHAR)); + len += len2; + ptr += sizeof(expand_dirW)/sizeof(WCHAR); + }else { + FIXME("Can't expand %s\n", debugstr_w(ptr)); + if(buf) + buf[len] = '%'; + len++; + ptr++; + } + + prev_ptr = ptr; + } + + if(buf) + strcpyW(buf+len, prev_ptr); + *size = len + strlenW(prev_ptr) + 1; +} + +static HRESULT process_hook_section(install_ctx_t *ctx, const WCHAR *sect_name) +{ + WCHAR buf[2048], val[2*MAX_PATH]; + const WCHAR *key; + DWORD len; + HRESULT hres; + + static const WCHAR runW[] = {'r','u','n',0}; + + len = GetPrivateProfileStringW(sect_name, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + if(!len) + return S_OK; + + for(key = buf; *key; key += strlenW(key)+1) { + if(!strcmpiW(key, runW)) { + WCHAR *cmd; + size_t size; + + len = GetPrivateProfileStringW(sect_name, runW, NULL, val, sizeof(val)/sizeof(*val), ctx->install_file); + + TRACE("Run %s\n", debugstr_w(val)); + + expand_command(ctx, val, NULL, &size); + + cmd = heap_alloc(size*sizeof(WCHAR)); + if(!cmd) + heap_free(cmd); + + expand_command(ctx, val, cmd, &size); + hres = RunSetupCommandW(ctx->hwnd, cmd, NULL, ctx->tmp_dir, NULL, NULL, 0, NULL); + heap_free(cmd); + if(FAILED(hres)) + return hres; + }else { + FIXME("Unsupported hook %s\n", debugstr_w(key)); + return E_NOTIMPL; + } + } + + return S_OK; +} + +static HRESULT install_inf_file(install_ctx_t *ctx) +{ + WCHAR buf[2048], sect_name[128]; + BOOL default_install = TRUE; + const WCHAR *key; + DWORD len; + HRESULT hres; + + static const WCHAR setup_hooksW[] = {'S','e','t','u','p',' ','H','o','o','k','s',0}; + static const WCHAR add_codeW[] = {'A','d','d','.','C','o','d','e',0}; + + len = GetPrivateProfileStringW(setup_hooksW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + if(len) { + default_install = FALSE; + + for(key = buf; *key; key += strlenW(key)+1) { + TRACE("[Setup Hooks] key: %s\n", debugstr_w(key)); + + len = GetPrivateProfileStringW(setup_hooksW, key, NULL, sect_name, sizeof(sect_name)/sizeof(*sect_name), + ctx->install_file); + if(!len) { + WARN("Could not get key value\n"); + return E_FAIL; + } + + hres = process_hook_section(ctx, sect_name); + if(FAILED(hres)) + return hres; + } + } + + len = GetPrivateProfileStringW(add_codeW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); + if(len) { + FIXME("[Add.Code] section not supported\n"); + + /* Don't throw an error if we successfully ran setup hooks; + installation is likely to be complete enough */ + if(default_install) + return E_NOTIMPL; + } + + if(default_install) { + hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, NULL, ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL); + if(FAILED(hres)) { + WARN("RunSetupCommandW failed: %08x\n", hres); + return hres; + } + } + + return S_OK; +} + static HRESULT install_cab_file(install_ctx_t *ctx) { WCHAR tmp_path[MAX_PATH], tmp_dir[MAX_PATH]; @@ -169,9 +297,7 @@ static HRESULT install_cab_file(install_ctx_t *ctx) switch(ctx->install_type) { case INSTALL_INF: - hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, NULL, ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL); - if(FAILED(hres)) - WARN("RunSetupCommandW failed: %08x\n", hres); + hres = install_inf_file(ctx); break; case INSTALL_DLL: FIXME("Installing DLL, registering in temporary location\n");

1 0

Dmitry Timoshkov : windowscodecs: Implement ComponentFactory_CreateBitmapFromMemory.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: 03724685d64a8be97e11c27f2039824837134d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03724685d64a8be97e11c27f2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 4 18:05:30 2013 +0800 windowscodecs: Implement ComponentFactory_CreateBitmapFromMemory. --- dlls/windowscodecs/bitmap.c | 11 ++++++++--- dlls/windowscodecs/imgfactory.c | 18 +++++++++++------- dlls/windowscodecs/tests/bitmap.c | 13 ++++--------- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 520fdef..f8904df 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -447,19 +447,23 @@ static const IWICBitmapVtbl BitmapImpl_Vtbl = { }; HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, + UINT stride, UINT datasize, BYTE *bits, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) { HRESULT hr; BitmapImpl *This; - UINT bpp, stride, datasize; BYTE *data; + UINT bpp; hr = get_pixelformat_bpp(pixelFormat, &bpp); if (FAILED(hr)) return hr; - stride = (((bpp*uiWidth)+31)/32)*4; - datasize = stride * uiHeight; + if (!stride) stride = (((bpp*uiWidth)+31)/32)*4; + if (!datasize) datasize = stride * uiHeight; + + if (datasize < stride * uiHeight) return WINCODEC_ERR_INSUFFICIENTBUFFER; + if (stride < ((bpp*uiWidth)+7)/8) return E_INVALIDARG; This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapImpl)); data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); @@ -469,6 +473,7 @@ HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, HeapFree(GetProcessHeap(), 0, data); return E_OUTOFMEMORY; } + if (bits) memcpy(data, bits, datasize); This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; This->ref = 1; diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 54b390b..1d05ef5 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -459,7 +460,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmap(IWICComponentFactory *iface, { TRACE("(%p,%u,%u,%s,%u,%p)\n", iface, uiWidth, uiHeight, debugstr_guid(pixelFormat), option, ppIBitmap); - return BitmapImpl_Create(uiWidth, uiHeight, pixelFormat, option, ppIBitmap); + return BitmapImpl_Create(uiWidth, uiHeight, 0, 0, NULL, pixelFormat, option, ppIBitmap); } static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFactory *iface, @@ -506,7 +507,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto } if (SUCCEEDED(hr)) - hr = BitmapImpl_Create(width, height, &pixelformat, option, &result); + hr = BitmapImpl_Create(width, height, 0, 0, NULL, &pixelformat, option, &result); if (SUCCEEDED(hr)) { @@ -576,12 +577,15 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSourceRect(IWICComponentF } static HRESULT WINAPI ComponentFactory_CreateBitmapFromMemory(IWICComponentFactory *iface, - UINT uiWidth, UINT uiHeight, REFWICPixelFormatGUID pixelFormat, UINT cbStride, - UINT cbBufferSize, BYTE *pbBuffer, IWICBitmap **ppIBitmap) + UINT width, UINT height, REFWICPixelFormatGUID format, UINT stride, + UINT size, BYTE *buffer, IWICBitmap **bitmap) { - FIXME("(%p,%u,%u,%s,%u,%u,%p,%p): stub\n", iface, uiWidth, uiHeight, - debugstr_guid(pixelFormat), cbStride, cbBufferSize, pbBuffer, ppIBitmap); - return E_NOTIMPL; + TRACE("(%p,%u,%u,%s,%u,%u,%p,%p\n", iface, width, height, + debugstr_guid(format), stride, size, buffer, bitmap); + + if (!stride || !size || !buffer || !bitmap) return E_INVALIDARG; + + return BitmapImpl_Create(width, height, stride, size, buffer, format, WICBitmapCacheOnLoad, bitmap); } static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index af0446c..f2f9cb6 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -439,34 +439,27 @@ static void test_CreateBitmapFromMemory(void) hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, 0, 0, NULL, &bitmap); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, 0, sizeof(data3x3), data3x3, &bitmap); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, 6, sizeof(data3x3), data3x3, &bitmap); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, 12, sizeof(data3x3), data3x3, &bitmap); -todo_wine ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, 9, sizeof(data3x3) - 1, data3x3, &bitmap); -todo_wine ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, 9, sizeof(data3x3), data3x3, &bitmap); -todo_wine ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromMemory error %#x\n", hr); - if (hr != S_OK) return; hr = IWICBitmap_GetSize(bitmap, &width, &height); ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); @@ -486,7 +479,6 @@ todo_wine hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 2, &GUID_WICPixelFormat24bppBGR, 13, sizeof(orig_data3x3), orig_data3x3, &bitmap); ok(hr == S_OK, "IWICImagingFactory_CreateBitmapFromMemory error %#x\n", hr); - if (hr != S_OK) return; hr = IWICBitmap_GetSize(bitmap, &width, &height); ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); @@ -497,7 +489,10 @@ todo_wine hr = IWICBitmap_CopyPixels(bitmap, NULL, 13, sizeof(data), data); ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); for (i = 0; i < sizeof(data); i++) - ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]); + if ((i % 13) < 9) + ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]); + else + todo_wine ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]); IWICBitmap_Release(bitmap); } diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 6857176..f8b7789 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -45,6 +45,7 @@ extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void* extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, + UINT stride, UINT datasize, BYTE *bits, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) DECLSPEC_HIDDEN; extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Just restore state-> user_stream in wined3d_device_draw_indexed_primitive_strided().
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: 44b462c9b4e3d7251e47a5a6a10f6b8b3389b7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b462c9b4e3d7251e47a5a6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 4 12:03:01 2013 +0100 wined3d: Just restore state->user_stream in wined3d_device_draw_indexed_primitive_strided(). --- dlls/wined3d/device.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 57eb0d2..78997f0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4067,13 +4067,6 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT return WINED3DERR_INVALIDCALL; } - /* The index buffer is not needed here, but restore it, otherwise it is hell to keep track of */ - if (device->stateBlock->state.user_stream) - { - device_invalidate_state(device, STATE_INDEXBUFFER); - device->stateBlock->state.user_stream = FALSE; - } - if (device->stateBlock->state.load_base_vertex_index) { device->stateBlock->state.load_base_vertex_index = 0; @@ -4108,12 +4101,6 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - if (device->stateBlock->state.user_stream) - { - device_invalidate_state(device, STATE_INDEXBUFFER); - device->stateBlock->state.user_stream = FALSE; - } - if (!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && device->stateBlock->state.load_base_vertex_index != device->stateBlock->state.base_vertex_index) { @@ -4180,6 +4167,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive_strided(struct wined3d_devic device->up_strided = strided_data; draw_primitive(device, 0, index_count, 0, 0, TRUE, index_data); device->up_strided = NULL; + device->stateBlock->state.user_stream = FALSE; device->stateBlock->state.index_format = prev_idx_format; device_invalidate_state(device, STATE_VDECL);

1 0

Henri Verbeet : wined3d: state-> user_stream is always FALSE in device_stream_info_from_declaration().
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: 76a2864a3b29b4688f941dd09c4e1fe3f5d4cc4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a2864a3b29b4688f941dd09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 4 12:02:59 2013 +0100 wined3d: state->user_stream is always FALSE in device_stream_info_from_declaration(). Since user pointer draws were removed, state->user_stream will only ever be set for "strided" draws, and device_stream_info_from_declaration() is never called for those. --- dlls/wined3d/device.c | 94 +++++++++++++++++++----------------------------- 1 files changed, 37 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 42cd226..8852472 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -181,9 +181,11 @@ void device_stream_info_from_declaration(struct wined3d_device *device, struct w struct wined3d_vertex_declaration *declaration = state->vertex_declaration; BOOL use_vshader; unsigned int i; + WORD map; stream_info->use_map = 0; stream_info->swizzle_map = 0; + stream_info->all_vbo = 1; /* Check for transformed vertices, disable vertex shader if present. */ stream_info->position_transformed = declaration->position_transformed; @@ -205,37 +207,25 @@ void device_stream_info_from_declaration(struct wined3d_device *device, struct w if (!buffer) continue; - data.buffer_object = 0; - data.addr = NULL; - stride = stream->stride; - if (state->user_stream) + + TRACE("Stream %u, buffer %p.\n", element->input_slot, buffer); + buffer_get_memory(buffer, &device->adapter->gl_info, &data); + + /* We can't use VBOs if the base vertex index is negative. OpenGL + * doesn't accept negative offsets (or rather offsets bigger than the + * VBO, because the pointer is unsigned), so use system memory + * sources. In most sane cases the pointer - offset will still be > 0, + * otherwise it will wrap around to some big value. Hope that with the + * indices, the driver wraps it back internally. If not, + * drawStridedSlow() is needed, including a vertex buffer path. */ + if (state->load_base_vertex_index < 0) { - TRACE("Stream %u is UP, %p\n", element->input_slot, buffer); + WARN("load_base_vertex_index is < 0 (%d), not using VBOs.\n", state->load_base_vertex_index); data.buffer_object = 0; - data.addr = (BYTE *)buffer; - } - else - { - TRACE("Stream %u isn't UP, %p\n", element->input_slot, buffer); - buffer_get_memory(buffer, &device->adapter->gl_info, &data); - - /* Can't use vbo's if the base vertex index is negative. OpenGL doesn't accept negative offsets - * (or rather offsets bigger than the vbo, because the pointer is unsigned), so use system memory - * sources. In most sane cases the pointer - offset will still be > 0, otherwise it will wrap - * around to some big value. Hope that with the indices, the driver wraps it back internally. If - * not, drawStridedSlow is needed, including a vertex buffer path. */ - if (state->load_base_vertex_index < 0) - { - WARN("load_base_vertex_index is < 0 (%d), not using VBOs.\n", - state->load_base_vertex_index); - data.buffer_object = 0; - data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info); - if ((UINT_PTR)data.addr < -state->load_base_vertex_index * stride) - { - FIXME("System memory vertex data load offset is negative!\n"); - } - } + data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info); + if ((UINT_PTR)data.addr < -state->load_base_vertex_index * stride) + FIXME("System memory vertex data load offset is negative!\n"); } data.addr += element->offset; @@ -295,42 +285,32 @@ void device_stream_info_from_declaration(struct wined3d_device *device, struct w } } + /* Preload the vertex buffers. */ device->num_buffer_queries = 0; - if (!state->user_stream) + for (i = 0, map = stream_info->use_map; map; map >>= 1, ++i) { - WORD map = stream_info->use_map; - stream_info->all_vbo = 1; - - /* PreLoad all the vertex buffers. */ - for (i = 0; map; map >>= 1, ++i) - { - struct wined3d_stream_info_element *element; - struct wined3d_buffer *buffer; + struct wined3d_stream_info_element *element; + struct wined3d_buffer *buffer; - if (!(map & 1)) continue; + if (!(map & 1)) + continue; - element = &stream_info->elements[i]; - buffer = state->streams[element->stream_idx].buffer; - wined3d_buffer_preload(buffer); + element = &stream_info->elements[i]; + buffer = state->streams[element->stream_idx].buffer; + wined3d_buffer_preload(buffer); - /* If the preload dropped the buffer object, update the stream info. */ - if (buffer->buffer_object != element->data.buffer_object) - { - element->data.buffer_object = 0; - element->data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info) - + (ptrdiff_t)element->data.addr; - } + /* If the preload dropped the buffer object, update the stream info. */ + if (buffer->buffer_object != element->data.buffer_object) + { + element->data.buffer_object = 0; + element->data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info) + (ptrdiff_t)element->data.addr; + } - if (!buffer->buffer_object) - stream_info->all_vbo = 0; + if (!buffer->buffer_object) + stream_info->all_vbo = 0; - if (buffer->query) - device->buffer_queries[device->num_buffer_queries++] = buffer->query; - } - } - else - { - stream_info->all_vbo = 0; + if (buffer->query) + device->buffer_queries[device->num_buffer_queries++] = buffer->query; } }

1 0

Henri Verbeet : wined3d: Don't touch state-> user_stream in wined3d_device_process_vertices().
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: b557f5ba3ad84e1c0f673160f7a7fb2dbf27add5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b557f5ba3ad84e1c0f673160f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 4 12:03:00 2013 +0100 wined3d: Don't touch state->user_stream in wined3d_device_process_vertices(). device_stream_info_from_declaration() no longer cares about state->user_stream. --- dlls/wined3d/device.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8852472..57eb0d2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3575,7 +3575,6 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, struct wined3d_state *state = &device->stateBlock->state; struct wined3d_stream_info stream_info; const struct wined3d_gl_info *gl_info; - BOOL streamWasUP = state->user_stream; struct wined3d_context *context; struct wined3d_shader *vs; unsigned int i; @@ -3593,14 +3592,9 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, context = context_acquire(device, NULL); gl_info = context->gl_info; - /* ProcessVertices reads from vertex buffers, which have to be assigned. - * DrawPrimitive and DrawPrimitiveUP control the streamIsUP flag, thus - * restore it afterwards. */ vs = state->vertex_shader; state->vertex_shader = NULL; - state->user_stream = FALSE; device_stream_info_from_declaration(device, &stream_info); - state->user_stream = streamWasUP; state->vertex_shader = vs; /* We can't convert FROM a VBO, and vertex buffers used to source into

1 0

Henri Verbeet : ddraw: Avoid LPD3DVIEWPORT.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: 29cb3c1d90cabedbb78535ea79594601907de29b URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cb3c1d90cabedbb78535ea7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 4 12:02:58 2013 +0100 ddraw: Avoid LPD3DVIEWPORT. --- include/d3d.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index fcd8e31..72b73d1 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -653,8 +653,8 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; - STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; - STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; + STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT *data) PURE; + STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE; @@ -721,8 +721,8 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; - STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; - STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; + STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT *data) PURE; + STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE; @@ -797,8 +797,8 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; - STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; - STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; + STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT *data) PURE; + STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPD3DMATRIX.
by Alexandre Julliard 04 Jan '13

04 Jan '13

Module: wine Branch: master Commit: 293f362d559b040cdb04b4b9dca5b95d95c00281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293f362d559b040cdb04b4b9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 4 12:02:57 2013 +0100 ddraw: Avoid LPD3DMATRIX. --- dlls/ddraw/ddraw_private.h | 4 +--- include/d3d.h | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index ab190ef..ed4cdfc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -563,9 +563,7 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel) DECLSPEC_HIDDEN; void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out) DECLSPEC_HIDDEN; void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) DECLSPEC_HIDDEN; -/* This only needs to be here as long the processvertices functionality of - * IDirect3DExecuteBuffer isn't in WineD3D */ -void multiply_matrix(LPD3DMATRIX dest, const D3DMATRIX *src1, const D3DMATRIX *src2) DECLSPEC_HIDDEN; +void multiply_matrix(D3DMATRIX *dst, const D3DMATRIX *src1, const D3DMATRIX *src2) DECLSPEC_HIDDEN; /* Used for generic dumping */ struct flag_info diff --git a/include/d3d.h b/include/d3d.h index 33fbd50..fcd8e31 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -953,8 +953,8 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD(GetPickRecords)(THIS_ LPDWORD lpCount, LPD3DPICKRECORD lpD3DPickRec) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE; STDMETHOD(CreateMatrix)(THIS_ D3DMATRIXHANDLE *matrix) PURE; - STDMETHOD(SetMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle, LPD3DMATRIX lpD3DMatrix) PURE; - STDMETHOD(GetMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle, LPD3DMATRIX lpD3DMatrix) PURE; + STDMETHOD(SetMatrix)(THIS_ D3DMATRIXHANDLE handle, D3DMATRIX *matrix) PURE; + STDMETHOD(GetMatrix)(THIS_ D3DMATRIXHANDLE handle, D3DMATRIX *matrix) PURE; STDMETHOD(DeleteMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; @@ -1051,9 +1051,9 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) STDMETHOD(SetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, DWORD dwRenderState) PURE; STDMETHOD(GetLightState)(THIS_ D3DLIGHTSTATETYPE dwLightStateType, LPDWORD lpdwLightState) PURE; STDMETHOD(SetLightState)(THIS_ D3DLIGHTSTATETYPE dwLightStateType, DWORD dwLightState) PURE; - STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; - STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; - STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; + STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; + STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; + STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, D3DVERTEXTYPE d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, D3DVERTEXTYPE d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; @@ -1170,9 +1170,9 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(SetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, DWORD dwRenderState) PURE; STDMETHOD(GetLightState)(THIS_ D3DLIGHTSTATETYPE dwLightStateType, LPDWORD lpdwLightState) PURE; STDMETHOD(SetLightState)(THIS_ D3DLIGHTSTATETYPE dwLightStateType, DWORD dwLightState) PURE; - STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; - STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; - STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; + STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; + STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; + STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; @@ -1304,10 +1304,10 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface7 *surface, DWORD flags) PURE; STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface7 **surface) PURE; STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags, D3DCOLOR color, D3DVALUE z, DWORD stencil) PURE; - STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; - STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; + STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; + STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT7 lpData) PURE; - STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType,LPD3DMATRIX lpD3DMatrix) PURE; + STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT7 lpData) PURE; STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL7 lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL7 lpMat) PURE;

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
74
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 January 2013