wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Alexandre Julliard : Remove empty DLL_PROCESS_DETACH case statements.
by Alexandre Julliard 15 Apr '13

15 Apr '13

1 0

Dmitry Timoshkov : server: Add support for NtTerminateProcess(0).
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: b92c82c9426c3315ef156027429c8c0a15e3a521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92c82c9426c3315ef1560274… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 15 18:21:21 2013 +0900 server: Add support for NtTerminateProcess(0). --- dlls/kernel32/tests/loader.c | 17 +++-------------- dlls/ntdll/process.c | 2 +- server/process.c | 12 ++++++++---- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index c88a995..ddf6fb3 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1105,12 +1105,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ret = GetExitCodeThread(attached_thread[i], &code); trace("dll: GetExitCodeThread(%u) => %d,%u\n", i, ret, code); ok(ret == 1, "GetExitCodeThread returned %d, expected 1\n", ret); - /* FIXME: remove once Wine is fixed */ - if (expected_code == STILL_ACTIVE || expected_code == 196) - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); - else - todo_wine - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); + ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); } if (test_dll_phase == 2) @@ -1230,7 +1225,6 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); status = pNtTerminateProcess(0, 195); - todo_wine ok(!status, "NtTerminateProcess error %#x\n", status); ret = pRtlDllShutdownInProgress(); @@ -1239,7 +1233,7 @@ static void child_process(const char *dll_name, DWORD target_offset) break; case 1: - case 2: /* ExitProcces will be called by PROCESS_DETACH handler */ + case 2: /* ExitProcess will be called by PROCESS_DETACH handler */ ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); @@ -1283,12 +1277,7 @@ static void child_process(const char *dll_name, DWORD target_offset) ret = GetExitCodeThread(attached_thread[i], &code); trace("child: GetExitCodeThread(%u) => %d,%u\n", i, ret, code); ok(ret == 1, "GetExitCodeThread returned %d, expected 1\n", ret); - /* FIXME: remove once Wine is fixed */ - if (expected_code == STILL_ACTIVE || expected_code == 196) - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); - else - todo_wine - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); + ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); } *child_failures = winetest_get_failures(); diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index a39f5d0..88a9e41 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -60,7 +60,7 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) self = !ret && reply->self; } SERVER_END_REQ; - if (self) exit( exit_code ); + if (self && handle) exit( exit_code ); return ret; } diff --git a/server/process.c b/server/process.c index 4f04a23..74a289a 100644 --- a/server/process.c +++ b/server/process.c @@ -1082,12 +1082,16 @@ DECL_HANDLER(terminate_process) { struct process *process; - if ((process = get_process_from_handle( req->handle, PROCESS_TERMINATE ))) + if (req->handle) { - reply->self = (current->process == process); - terminate_process( process, current, req->exit_code ); - release_object( process ); + process = get_process_from_handle( req->handle, PROCESS_TERMINATE ); + if (!process) return; } + else process = (struct process *)grab_object( current->process ); + + reply->self = (current->process == process); + terminate_process( process, current, req->exit_code ); + release_object( process ); } /* fetch information about a process */

1 0

Dmitry Timoshkov : kernel32: Make the ExitProcess test work on x86_64.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: c5fbb4a780b856ab7281d675d3ccd141287ceb6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5fbb4a780b856ab7281d675d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 15 18:10:00 2013 +0900 kernel32: Make the ExitProcess test work on x86_64. --- dlls/kernel32/tests/loader.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 61ec904..c88a995 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -408,7 +408,6 @@ static void test_Loader(void) if (nt_header.OptionalHeader.SectionAlignment >= si.dwPageSize) { const char *start; - int size; start = (const char *)hlib + nt_header.OptionalHeader.SizeOfHeaders; size = ALIGN_SIZE((ULONG_PTR)start, si.dwPageSize) - (ULONG_PTR)start; @@ -449,7 +448,6 @@ static void test_Loader(void) if (nt_header.OptionalHeader.SectionAlignment >= si.dwPageSize) { const char *start; - int size; start = (const char *)hlib + section.VirtualAddress + section.PointerToRawData + section.SizeOfRawData; size = ALIGN_SIZE((ULONG_PTR)start, si.dwPageSize) - (ULONG_PTR)start; @@ -1302,20 +1300,20 @@ static void child_process(const char *dll_name, DWORD target_offset) static void test_ExitProcess(void) { #include "pshpack1.h" -#ifdef JMP_EAX +#ifdef __x86_64__ static struct section_data { - BYTE mov_eax; + BYTE mov_rax[2]; void *target; - BYTE jmp_eax[2]; - } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } }; + BYTE jmp_rax[2]; + } section_data = { { 0x48,0xb8 }, dll_entry_point, { 0xff,0xe0 } }; #else static struct section_data { - BYTE push; + BYTE mov_eax; void *target; - BYTE ret; - } section_data = { 0x68, dll_entry_point, 0xc3 }; + BYTE jmp_eax[2]; + } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } }; #endif #include "poppack.h" static const char filler[0x1000]; @@ -1327,7 +1325,7 @@ static void test_ExitProcess(void) PROCESS_INFORMATION pi; STARTUPINFO si = { sizeof(si) }; -#ifndef __i386__ +#if !defined(__i386__) && !defined(__x86_64__) skip("x86 specific ExitProcess test\n"); return; #endif

1 0

Piotr Caban : wininet: Fixed Cache-Content: no-cache tests.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 0d50e86f6abb27e5de643b2de4ece28489374000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d50e86f6abb27e5de643b2de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 15 14:58:25 2013 +0200 wininet: Fixed Cache-Content: no-cache tests. --- dlls/wininet/tests/http.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 968f9e4..031efb1 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1826,6 +1826,7 @@ static DWORD CALLBACK server_thread(LPVOID param) int last_request = 0; char host_header[22]; static int test_b = 0; + static int test_no_cache = 0; WSAStartup(MAKEWORD(1,1), &wsaData); @@ -2018,7 +2019,10 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "GET /test_cache_control_no_cache")) { static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: no-cache\r\n\r\nsome content"; - send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + if(!test_no_cache++) + send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + else + send(c, okmsg, sizeof(okmsg)-1, 0); } if (strstr(buffer, "GET /test_cache_control_no_store")) { @@ -2517,8 +2521,17 @@ static void test_no_cache(int port) ok(size == 12, "read %d bytes of data\n", size); InternetCloseHandle(req); - ret = DeleteUrlCacheEntry(cache_url); - ok(!ret && GetLastError()==ERROR_FILE_NOT_FOUND, "cache entry should not exist\n"); + req = HttpOpenRequest(con, NULL, cache_control_no_cache, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf, sizeof(buf), &read) && read) + size += read; + ok(size == 0, "read %d bytes of data\n", size); + InternetCloseHandle(req); + DeleteUrlCacheEntry(cache_url); req = HttpOpenRequest(con, NULL, cache_control_no_store, NULL, NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n");

1 0

Hans Leidekker : msi: Don't overwrite verstr in set_installer_properties.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: ca025a525d50f253a7e450b8ac01898f1f02eba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca025a525d50f253a7e450b8a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 15 10:25:34 2013 +0200 msi: Don't overwrite verstr in set_installer_properties. --- dlls/msi/package.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bcda102..6b3d16c 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -873,10 +873,10 @@ static VOID set_installer_properties(MSIPACKAGE *package) msi_set_property( package->db, szMsiNTProductType, verstr, len ); break; } - len = sprintfW( verstr, szFormat, OSVersion.dwBuildNumber ); - msi_set_property( package->db, szWindowsBuild, verstr, len ); - len = sprintfW( verstr, szFormat, OSVersion.wServicePackMajor ); - msi_set_property( package->db, szServicePackLevel, verstr, len ); + len = sprintfW( bufstr, szFormat, OSVersion.dwBuildNumber ); + msi_set_property( package->db, szWindowsBuild, bufstr, len ); + len = sprintfW( bufstr, szFormat, OSVersion.wServicePackMajor ); + msi_set_property( package->db, szServicePackLevel, bufstr, len ); len = sprintfW( bufstr, szFormat2, MSI_MAJORVERSION, MSI_MINORVERSION ); msi_set_property( package->db, szVersionMsi, bufstr, len );

1 0

Henri Verbeet : d3drm: Avoid LPD3DRMANIMATIONKEY.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: cbf57825456815a0b3ac5e8a49a88aa810d517dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf57825456815a0b3ac5e8a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 15 08:14:55 2013 +0200 d3drm: Avoid LPD3DRMANIMATIONKEY. --- include/d3drmobj.h | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index ea09186..cd30911 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3879,11 +3879,9 @@ DECLARE_INTERFACE_(IDirect3DRMAnimation2, IDirect3DRMObject) STDMETHOD_(D3DRMANIMATIONOPTIONS, GetOptions)(THIS) PURE; STDMETHOD(GetFrame)(THIS_ LPDIRECT3DRMFRAME3 *lpD3DFrame) PURE; STDMETHOD(DeleteKeyByID)(THIS_ DWORD dwID) PURE; - STDMETHOD(AddKey)(THIS_ LPD3DRMANIMATIONKEY lpKey) PURE; - STDMETHOD(ModifyKey)(THIS_ LPD3DRMANIMATIONKEY lpKey) PURE; - STDMETHOD(GetKeys)(THIS_ D3DVALUE dvTimeMin, - D3DVALUE dvTimeMax, LPDWORD lpdwNumKeys, - LPD3DRMANIMATIONKEY lpKey); + STDMETHOD(AddKey)(THIS_ D3DRMANIMATIONKEY *key) PURE; + STDMETHOD(ModifyKey)(THIS_ D3DRMANIMATIONKEY *key) PURE; + STDMETHOD(GetKeys)(THIS_ D3DVALUE time_min, D3DVALUE time_max, DWORD *key_count, D3DRMANIMATIONKEY *keys); }; #undef INTERFACE

1 0

Henri Verbeet : d3drm: Avoid LPD3DRMPMESHLOADSTATUS.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: a6a38bb2591865248a2240cb0bb01c3b35227b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a38bb2591865248a2240cb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 15 08:14:54 2013 +0200 d3drm: Avoid LPD3DRMPMESHLOADSTATUS. --- include/d3drmobj.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 47e4d48..ea09186 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2021,7 +2021,7 @@ DECLARE_INTERFACE_(IDirect3DRMProgressiveMesh,IDirect3DRMVisual) /*** IDirect3DRMProgressiveMesh methods ***/ STDMETHOD(Load) (THIS_ LPVOID pObjLocation, LPVOID pObjId, D3DRMLOADOPTIONS dloLoadflags, D3DRMLOADTEXTURECALLBACK pCallback, LPVOID lpArg) PURE; - STDMETHOD(GetLoadStatus) (THIS_ LPD3DRMPMESHLOADSTATUS pStatus) PURE; + STDMETHOD(GetLoadStatus) (THIS_ D3DRMPMESHLOADSTATUS *status) PURE; STDMETHOD(SetMinRenderDetail) (THIS_ D3DVALUE d3dVal) PURE; STDMETHOD(Abort) (THIS_ DWORD flags) PURE; STDMETHOD(GetFaceDetail) (THIS_ LPDWORD pCount) PURE;

1 0

Henri Verbeet : d3drm: Get rid of Direct3DRM_create().
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 06561779110c8d0b55fa9d71716776499144ca65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06561779110c8d0b55fa9d717… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 15 08:14:53 2013 +0200 d3drm: Get rid of Direct3DRM_create(). --- dlls/d3drm/d3drm.c | 11 +++++------ dlls/d3drm/d3drm_main.c | 10 ---------- dlls/d3drm/d3drm_private.h | 1 - 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index a18eb11..65dea6c 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1678,14 +1678,13 @@ static const struct IDirect3DRM3Vtbl Direct3DRM3_Vtbl = IDirect3DRM3Impl_GetOptions }; -HRESULT Direct3DRM_create(IUnknown** ppObj) +HRESULT WINAPI Direct3DRMCreate(IDirect3DRM **d3drm) { - IDirect3DRMImpl* object; + IDirect3DRMImpl *object; - TRACE("(%p)\n", ppObj); + TRACE("d3drm %p.\n", d3drm); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMImpl)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRM_iface.lpVtbl = &Direct3DRM_Vtbl; @@ -1693,7 +1692,7 @@ HRESULT Direct3DRM_create(IUnknown** ppObj) object->IDirect3DRM3_iface.lpVtbl = &Direct3DRM3_Vtbl; object->ref = 1; - *ppObj = (IUnknown*)&object->IDirect3DRM_iface; + *d3drm = &object->IDirect3DRM_iface; return S_OK; } diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index 2adc188..c9bf703 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -42,13 +42,3 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } return TRUE; } - -/*********************************************************************** - * (D3DRM.@) - */ -HRESULT WINAPI Direct3DRMCreate(LPDIRECT3DRM* ppDirect3DRM) -{ - TRACE("(%p)\n", ppDirect3DRM); - - return Direct3DRM_create((IUnknown**)ppDirect3DRM); -} diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 0283cad..ce896a1 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -24,7 +24,6 @@ #include "d3drm.h" #include "dxfile.h" -HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN; HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3drm: Just use RGBA_MAKE.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 0c228f5faf61d5fa11da74cdc866aa53fe755407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c228f5faf61d5fa11da74cdc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 15 08:14:52 2013 +0200 d3drm: Just use RGBA_MAKE. D3DCOLOR_ARGB is a d3d8+ thing, ddraw has RGBA_MAKE. --- dlls/d3drm/d3drm_private.h | 2 -- dlls/d3drm/frame.c | 7 +++---- dlls/d3drm/light.c | 4 +--- dlls/d3drm/meshbuilder.c | 12 ++++-------- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 941e467..0283cad 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -24,8 +24,6 @@ #include "d3drm.h" #include "dxfile.h" -#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) - HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index b0bbaa6..3492cca 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2133,9 +2133,8 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetSceneBackgroundRGB(IDirect3DRMFra TRACE("(%p/%p)->(%f,%f,%f)\n", iface, This, red, green, blue); - This->scenebackground = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), - (BYTE)(green * 255.0f), - (BYTE)(blue * 255.0f)); + This->scenebackground = RGBA_MAKE((BYTE)(red * 255.0f), + (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); return D3DRM_OK; } @@ -2661,7 +2660,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa object->IDirect3DRMFrame2_iface.lpVtbl = &Direct3DRMFrame2_Vtbl; object->IDirect3DRMFrame3_iface.lpVtbl = &Direct3DRMFrame3_Vtbl; object->ref = 1; - object->scenebackground = D3DCOLOR_ARGB(0xff, 0, 0, 0); + object->scenebackground = RGBA_MAKE(0, 0, 0, 0xff); memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 32500bf..d8eed7e 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -213,9 +213,7 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetColorRGB(IDirect3DRMLight* iface, TRACE("(%p/%p)->(%f,%f,%f)\n", iface, This, red, green, blue); - This->color = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), - (BYTE)(green * 255.0f), - (BYTE)(blue * 255.0f)); + This->color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); return D3DRM_OK; } diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 51f981a..065503a 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1337,8 +1337,8 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, values = (float*)ptr; - This->materials[i].color = D3DCOLOR_ARGB((BYTE)(values[3] * 255.0f), (BYTE)(values[0] * 255.0f), - (BYTE)(values[1] * 255.0f), (BYTE)(values[2] * 255.0f)); + This->materials[i].color = RGBA_MAKE((BYTE)(values[0] * 255.0f), (BYTE)(values[1] * 255.0f), + (BYTE)(values[2] * 255.0f), (BYTE)(values[3] * 255.0f)); IDirect3DRMMaterial2_SetAmbient(This->materials[i].material, values[0], values [1], values[2]); /* Alpha ignored */ IDirect3DRMMaterial2_SetPower(This->materials[i].material, values[4]); @@ -1827,9 +1827,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetColorRGB(IDirect3DRMMeshBui TRACE("(%p)->(%f,%f,%f)\n", This, red, green, blue); - This->color = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), - (BYTE)(green * 255.0f), - (BYTE)(blue * 255.0f)); + This->color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); return D3DRM_OK; } @@ -2845,9 +2843,7 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupColorRGB(IDirect3DRMMesh* ifac if (id >= This->nb_groups) return D3DRMERR_BADVALUE; - This->groups[id].color = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), - (BYTE)(green * 255.0f), - (BYTE)(blue * 255.0f)); + This->groups[id].color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); return D3DRM_OK; }

1 0

Henri Verbeet : wined3d: Use GL_STATIC_DRAW_ARB for static buffers.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 12a05be5b6a081c957619e0e751a56dc28d5b423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a05be5b6a081c957619e0e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 15 08:14:51 2013 +0200 wined3d: Use GL_STATIC_DRAW_ARB for static buffers. This mostly affects the initial placement of the VBO. If an application really does use a static buffer as if it was a dynamic one the driver is likely to migrate it out of VRAM anyway, we shouldn't penalize more well-behaved applications for that. --- dlls/wined3d/buffer.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e9a07a5..dc5b4d2 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -113,7 +113,8 @@ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_g /* Context activation is done by the caller. */ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) { - GLenum error, gl_usage; + GLenum gl_usage = GL_STATIC_DRAW_ARB; + GLenum error; TRACE("Creating an OpenGL vertex buffer object for wined3d_buffer %p with usage %s.\n", This, debug_d3dusage(This->resource.usage)); @@ -149,12 +150,9 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc goto fail; } - /* Don't use static, because dx apps tend to update the buffer - * quite often even if they specify 0 usage. - */ - if(This->resource.usage & WINED3DUSAGE_DYNAMIC) + if (This->resource.usage & WINED3DUSAGE_DYNAMIC) { - TRACE("Gl usage = GL_STREAM_DRAW_ARB\n"); + TRACE("Buffer has WINED3DUSAGE_DYNAMIC set.\n"); gl_usage = GL_STREAM_DRAW_ARB; if(gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) @@ -169,11 +167,6 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc } /* No setup is needed here for GL_ARB_map_buffer_range */ } - else - { - TRACE("Gl usage = GL_DYNAMIC_DRAW_ARB\n"); - gl_usage = GL_DYNAMIC_DRAW_ARB; - } /* Reserve memory for the buffer. The amount of data won't change * so we are safe with calling glBufferData once and

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
58
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 April 2013