May 2015 - Wine-commits - list.winehq.org

Henri Verbeet : d3drm: Also validate face indices against the vertex count in load_mesh_data() ( Valgrind).
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: e723d2a0793b23ad527b681d01ecbb39af757c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e723d2a0793b23ad527b681d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 4 13:21:31 2015 +0200 d3drm: Also validate face indices against the vertex count in load_mesh_data() (Valgrind). --- dlls/d3drm/meshbuilder.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c24d9dc..8bd5131 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1368,7 +1368,10 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, if (!This->nb_normals) { /* Compute face normal */ - if (nb_face_indexes > 2) + if (nb_face_indexes > 2 + && faces_vertex_idx_ptr[0] < This->nb_vertices + && faces_vertex_idx_ptr[1] < This->nb_vertices + && faces_vertex_idx_ptr[2] < This->nb_vertices) { D3DVECTOR a, b;

1 0

Henri Verbeet : d3drm/tests: Release the material after a GetGroupMaterial () call in test_MeshBuilder() (Valgrind).
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: e2e1ac2bf64073997d490dfd15e6173531190178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2e1ac2bf64073997d490dfd1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 4 13:21:32 2015 +0200 d3drm/tests: Release the material after a GetGroupMaterial() call in test_MeshBuilder() (Valgrind). --- dlls/d3drm/tests/d3drm.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8617a3d..5dcfddc 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -447,21 +447,19 @@ static void test_MeshBuilder(void) hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material); ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); ok(material != NULL, "No material present\n"); - if ((hr == D3DRM_OK) && material) - { - hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]); - ok(hr == D3DRM_OK, "GetMaterialEmissive failed returning hr = %x\n", hr); - ok(values[0] == 0.5f, "Emissive red component should be %f instead of %f\n", 0.5f, values[0]); - ok(values[1] == 0.5f, "Emissive green component should be %f instead of %f\n", 0.5f, values[1]); - ok(values[2] == 0.5f, "Emissive blue component should be %f instead of %f\n", 0.5f, values[2]); - hr = IDirect3DRMMaterial_GetSpecular(material, &values[0], &values[1], &values[2]); - ok(hr == D3DRM_OK, "GetMaterialEmissive failed returning hr = %x\n", hr); - ok(values[0] == 1.0f, "Specular red component should be %f instead of %f\n", 1.0f, values[0]); - ok(values[1] == 0.0f, "Specular green component should be %f instead of %f\n", 0.0f, values[1]); - ok(values[2] == 0.0f, "Specular blue component should be %f instead of %f\n", 0.0f, values[2]); - values[0] = IDirect3DRMMaterial_GetPower(material); - ok(values[0] == 30.0f, "Power value should be %f instead of %f\n", 30.0f, values[0]); - } + hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]); + ok(hr == D3DRM_OK, "Failed to get emissive color, hr %#x.\n", hr); + ok(values[0] == 0.5f, "Got unexpected red component %.8e.\n", values[0]); + ok(values[1] == 0.5f, "Got unexpected green component %.8e.\n", values[1]); + ok(values[2] == 0.5f, "Got unexpected blue component %.8e.\n", values[2]); + hr = IDirect3DRMMaterial_GetSpecular(material, &values[0], &values[1], &values[2]); + ok(hr == D3DRM_OK, "Failed to get specular color, hr %#x.\n", hr); + ok(values[0] == 1.0f, "Got unexpected red component %.8e.\n", values[0]); + ok(values[1] == 0.0f, "Got unexpected green component %.8e.\n", values[1]); + ok(values[2] == 0.0f, "Got unexpected blue component %.8e.\n", values[2]); + values[0] = IDirect3DRMMaterial_GetPower(material); + ok(values[0] == 30.0f, "Got unexpected power value %.8e.\n", values[0]); + IDirect3DRMMaterial_Release(material); IDirect3DRMMesh_Release(mesh); }

1 0

Sebastian Lackner : krnl386.exe16: Do not omit mandatory argument for VirtualProtect.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 5f069c160102adbab3dbffe04ff19e4dfce8636d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f069c160102adbab3dbffe04… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:43:05 2015 +0200 krnl386.exe16: Do not omit mandatory argument for VirtualProtect. --- dlls/krnl386.exe16/dosmem.c | 6 ++++-- dlls/krnl386.exe16/dosvm.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c index f0feba9..b899f7b 100644 --- a/dlls/krnl386.exe16/dosmem.c +++ b/dlls/krnl386.exe16/dosmem.c @@ -302,6 +302,7 @@ BOOL DOSMEM_InitDosMemory(void) { static BOOL done; static HANDLE hRunOnce; + DWORD old_prot; if (done) return TRUE; @@ -317,7 +318,7 @@ BOOL DOSMEM_InitDosMemory(void) /* ok, we're the winning thread */ if (!(ret = VirtualProtect( DOSMEM_dosmem + DOSMEM_protect, DOSMEM_SIZE - DOSMEM_protect, - PAGE_READWRITE, NULL ))) + PAGE_READWRITE, &old_prot ))) ERR("Cannot load access low 1Mb, DOS subsystem unavailable\n"); RemoveVectoredExceptionHandler( vectored_handler ); @@ -650,10 +651,11 @@ UINT DOSMEM_Available(void) BOOL DOSMEM_MapDosLayout(void) { static BOOL already_mapped; + DWORD old_prot; if (!already_mapped) { - if (DOSMEM_dosmem || !VirtualProtect( NULL, DOSMEM_SIZE, PAGE_EXECUTE_READWRITE, NULL )) + if (DOSMEM_dosmem || !VirtualProtect( NULL, DOSMEM_SIZE, PAGE_EXECUTE_READWRITE, &old_prot )) { ERR( "Need full access to the first megabyte for DOS mode\n" ); ExitProcess(1); diff --git a/dlls/krnl386.exe16/dosvm.c b/dlls/krnl386.exe16/dosvm.c index 87adf33..4e76215 100644 --- a/dlls/krnl386.exe16/dosvm.c +++ b/dlls/krnl386.exe16/dosvm.c @@ -827,6 +827,7 @@ LPVOID DOSVM_AllocDataUMB( DWORD size, WORD *segment, WORD *selector ) */ void DOSVM_InitSegments(void) { + DWORD old_prot; LPSTR ptr; int i; @@ -966,7 +967,7 @@ void DOSVM_InitSegments(void) /* * As we store code in UMB we should make sure it is executable */ - VirtualProtect((void *)DOSVM_UMB_BOTTOM, DOSVM_UMB_TOP - DOSVM_UMB_BOTTOM, PAGE_EXECUTE_READWRITE, NULL); + VirtualProtect((void *)DOSVM_UMB_BOTTOM, DOSVM_UMB_TOP - DOSVM_UMB_BOTTOM, PAGE_EXECUTE_READWRITE, &old_prot); event_notifier = CreateEventW(NULL, FALSE, FALSE, NULL); }

1 0

Sebastian Lackner : ntdll: Do not omit mandatory argument for VirtualProtect.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 64ee8a4a53ef2ad542fc981eae35a98a2e30cd03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ee8a4a53ef2ad542fc981ea… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:43:24 2015 +0200 ntdll: Do not omit mandatory argument for VirtualProtect. --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9810f07..921bf57 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -685,7 +685,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d done: /* restore old protection of the import address table */ - NtProtectVirtualMemory( NtCurrentProcess(), &protect_base, &protect_size, protect_old, NULL ); + NtProtectVirtualMemory( NtCurrentProcess(), &protect_base, &protect_size, protect_old, &protect_old ); return wmImp; }

1 0

Sebastian Lackner : winedevice: Do not omit mandatory argument for VirtualProtect.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: c16f0644beab693f77a589053e1a92b4e0f7adb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c16f0644beab693f77a589053… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:43:34 2015 +0200 winedevice: Do not omit mandatory argument for VirtualProtect. --- programs/winedevice/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 9677a82..ef1e1ef 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -98,14 +98,14 @@ static HMODULE load_driver_module( const WCHAR *name ) VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, NULL ); + if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); if (!rel) goto error; } /* make sure we don't try again */ size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; VirtualProtect( nt, size, PAGE_READWRITE, &old ); nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; - VirtualProtect( nt, size, old, NULL ); + VirtualProtect( nt, size, old, &old ); } }

1 0

Aric Stewart : setupapi: Restore close brace before using guid string as reg key.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: a3487ad3169f5d323ffec2ded6754c3357640161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3487ad3169f5d323ffec2ded… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 1 07:58:37 2015 -0500 setupapi: Restore close brace before using guid string as reg key. --- dlls/setupapi/devinst.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 966af75..2a97eab 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2132,6 +2132,8 @@ static void SETUPDI_EnumerateInterfaces(HDEVINFO DeviceInfoSet, interfaceGuidStr[37] = 0; UuidFromStringW(&interfaceGuidStr[1], &interfaceGuid); + interfaceGuidStr[37] = '}'; + interfaceGuidStr[38] = 0; l = RegOpenKeyExW(interfacesKey, interfaceGuidStr, 0, KEY_READ, &interfaceKey); if (!l)

1 0

Andrew Eikum : mmdevapi: Always use 64-bit registry keys.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: b55cc5e4c5083d7833cc637f07c2d8f9813bf1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55cc5e4c5083d7833cc637f0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 1 13:11:12 2015 -0500 mmdevapi: Always use 64-bit registry keys. --- dlls/mmdevapi/devenum.c | 14 +++---- dlls/mmdevapi/tests/propstore.c | 93 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index d612ec0..1952bda 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -143,12 +143,12 @@ static HRESULT MMDevPropStore_OpenPropKey(const GUID *guid, DWORD flow, HKEY *pr LONG ret; HKEY key; StringFromGUID2(guid, buffer, 39); - if ((ret = RegOpenKeyExW(flow == eRender ? key_render : key_capture, buffer, 0, KEY_READ|KEY_WRITE, &key)) != ERROR_SUCCESS) + if ((ret = RegOpenKeyExW(flow == eRender ? key_render : key_capture, buffer, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, &key)) != ERROR_SUCCESS) { WARN("Opening key %s failed with %u\n", debugstr_w(buffer), ret); return E_FAIL; } - ret = RegOpenKeyExW(key, reg_properties, 0, KEY_READ|KEY_WRITE, propkey); + ret = RegOpenKeyExW(key, reg_properties, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, propkey); RegCloseKey(key); if (ret != ERROR_SUCCESS) { @@ -345,11 +345,11 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st else root = key_capture; - if (RegCreateKeyExW(root, guidstr, 0, NULL, 0, KEY_WRITE|KEY_READ, NULL, &key, NULL) == ERROR_SUCCESS) + if (RegCreateKeyExW(root, guidstr, 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &key, NULL) == ERROR_SUCCESS) { HKEY keyprop; RegSetValueExW(key, reg_devicestate, 0, REG_DWORD, (const BYTE*)&state, sizeof(DWORD)); - if (!RegCreateKeyExW(key, reg_properties, 0, NULL, 0, KEY_WRITE|KEY_READ, NULL, &keyprop, NULL)) + if (!RegCreateKeyExW(key, reg_properties, 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &keyprop, NULL)) { PROPVARIANT pv; @@ -406,11 +406,11 @@ static HRESULT load_devices_from_reg(void) LONG ret; DWORD curflow; - ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, software_mmdevapi, 0, NULL, 0, KEY_WRITE|KEY_READ, NULL, &root, NULL); + ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, software_mmdevapi, 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &root, NULL); if (ret == ERROR_SUCCESS) - ret = RegCreateKeyExW(root, reg_capture, 0, NULL, 0, KEY_READ|KEY_WRITE, NULL, &key_capture, NULL); + ret = RegCreateKeyExW(root, reg_capture, 0, NULL, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, NULL, &key_capture, NULL); if (ret == ERROR_SUCCESS) - ret = RegCreateKeyExW(root, reg_render, 0, NULL, 0, KEY_READ|KEY_WRITE, NULL, &key_render, NULL); + ret = RegCreateKeyExW(root, reg_render, 0, NULL, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, NULL, &key_render, NULL); RegCloseKey(root); cur = key_capture; curflow = eCapture; diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index bcb5044..06fe690 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -30,6 +30,19 @@ #include "mmdeviceapi.h" #include "devpkey.h" +static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); + +static const WCHAR software_renderW[] = + { 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'M','M','D','e','v','i','c','e','s','\\', + 'A','u','d','i','o','\\', + 'R','e','n','d','e','r',0 }; +static const WCHAR propertiesW[] = {'P','r','o','p','e','r','t','i','e','s',0}; + + static void test_propertystore(IPropertyStore *store) { HRESULT hr; @@ -109,12 +122,86 @@ static void test_getat(IPropertyStore *store) ok(found_desc == TRUE, "DEVPKEY_Device_DeviceDesc not found\n"); } +static void test_setvalue_on_wow64(IPropertyStore *store) +{ + PROPVARIANT pv; + HRESULT hr; + LONG ret; + WCHAR *guidW; + HKEY root, props, devkey; + DWORD type, regval, size; + + static const PROPERTYKEY PKEY_Bogus = { + {0x1da5d803, 0xd492, 0x4edd, {0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x00}}, 0x7f + }; + static const WCHAR bogusW[] = {'{','1','D','A','5','D','8','0','3','-','D','4','9','2','-','4','E','D','D','-','8','C','2','3','-','E','0','C','0','F','F','E','E','7','F','0','0','}',',','1','2','7',0}; + + PropVariantInit(&pv); + + pv.vt = VT_EMPTY; + hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_GUID, &pv); + ok(hr == S_OK, "Failed to get Endpoint GUID: %08x\n", hr); + + guidW = pv.u.pwszVal; + + pv.vt = VT_UI4; + pv.u.ulVal = 0xAB; + + hr = IPropertyStore_SetValue(store, &PKEY_Bogus, &pv); + ok(hr == S_OK || hr == E_ACCESSDENIED, "SetValue failed: %08x\n", hr); + if (hr != S_OK) + { + win_skip("Missing permission to write to registry\n"); + return; + } + + pv.u.ulVal = 0x00; + + hr = IPropertyStore_GetValue(store, &PKEY_Bogus, &pv); + ok(hr == S_OK, "GetValue failed: %08x\n", hr); + ok(pv.u.ulVal == 0xAB, "Got wrong value: 0x%x\n", pv.u.ulVal); + + /* should find the key in 64-bit view */ + ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, software_renderW, 0, KEY_READ|KEY_WOW64_64KEY, &root); + ok(ret == ERROR_SUCCESS, "Couldn't open mmdevices Render key: %u\n", ret); + + ret = RegOpenKeyExW(root, guidW, 0, KEY_READ|KEY_WOW64_64KEY, &devkey); + ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice guid key: %u\n", ret); + + ret = RegOpenKeyExW(devkey, propertiesW, 0, KEY_READ|KEY_WOW64_64KEY, &props); + ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice property key: %u\n", ret); + + /* Note: the registry key exists even without calling IPropStore::Commit */ + size = sizeof(regval); + ret = RegGetValueW(props, NULL, bogusW, RRF_RT_DWORD, &type, &regval, &size); + ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %u\n", ret); + ok(type == REG_DWORD, "Got wrong value type: %u\n", type); + ok(regval == 0xAB, "Got wrong value: 0x%x\n", regval); + + RegCloseKey(props); + RegCloseKey(devkey); + RegCloseKey(root); + + CoTaskMemFree(guidW); + + /* should NOT find the key in 32-bit view */ + ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, software_renderW, 0, KEY_READ, &root); + ok(ret == ERROR_FILE_NOT_FOUND, "Wrong error when opening mmdevices Render key: %u\n", ret); +} + START_TEST(propstore) { HRESULT hr; IMMDeviceEnumerator *mme = NULL; IMMDevice *dev = NULL; IPropertyStore *store; + BOOL is_wow64 = FALSE; + HMODULE hk32 = GetModuleHandleA("kernel32.dll"); + + pIsWow64Process = (void *)GetProcAddress(hk32, "IsWow64Process"); + + if (pIsWow64Process) + pIsWow64Process(GetCurrentProcess(), &is_wow64); CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); @@ -149,13 +236,17 @@ START_TEST(propstore) ok(hr == E_POINTER, "Wrong hr returned: %08x\n", hr); store = NULL; - hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &store); + hr = IMMDevice_OpenPropertyStore(dev, STGM_READWRITE, &store); + if(hr == E_ACCESSDENIED) + hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &store); ok(hr == S_OK, "Opening valid store returned %08x\n", hr); if (store) { test_propertystore(store); test_deviceinterface(store); test_getat(store); + if (is_wow64) + test_setvalue_on_wow64(store); IPropertyStore_Release(store); } IMMDevice_Release(dev);

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless union.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: cb16c706026a79ad65032923f67e3245313a1c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb16c706026a79ad65032923f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 2 13:06:28 2015 +0200 ddraw/tests: Fix compilation on systems that don't support nameless union. --- dlls/ddraw/tests/ddraw7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e151fb7..b8691b8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3862,7 +3862,7 @@ static void test_specular_lighting(void) ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); memset(&material, 0, sizeof(material)); - U(U2(material).specular).r = 1.0f; + U1(U2(material).specular).r = 1.0f; U2(U2(material).specular).g = 1.0f; U3(U2(material).specular).b = 1.0f; U4(U2(material).specular).a = 1.0f;

1 0

Francois Gouget : wined3d: Add a trailing '\n' to a generated shader line.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: f129e2fbb157457588a437ce595e5fb32240e46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f129e2fbb157457588a437ce5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 2 23:50:59 2015 +0200 wined3d: Add a trailing '\n' to a generated shader line. --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b9d95e6..fe1cef1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5457,7 +5457,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "att = dot(dst.xyz, vec3(ffp_light[%u].c_att," " ffp_light[%u].l_att, ffp_light[%u].q_att));\n", i, i, i); if (!legacy_lighting) - shader_addline(buffer, "att = 1.0 / att;"); + shader_addline(buffer, "att = 1.0 / att;\n"); shader_addline(buffer, "ambient += ffp_light[%u].ambient.xyz * att;\n", i); if (!settings->normal) {

1 0

Francois Gouget : ole32: Fix some storage32 comments.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 58e47c612f54ee21b3c24c24e3575179c63a0c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e47c612f54ee21b3c24c24e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 2 23:51:22 2015 +0200 ole32: Fix some storage32 comments. --- dlls/ole32/storage32.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index e03bf31..f894582 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -363,9 +363,9 @@ void StorageBaseImpl_RemoveStream(StorageBaseImpl * stg, StgStreamImpl * strm) D #define BLOCKCHAIN_CACHE_SIZE 4 /**************************************************************************** - * Storage32Impl definitions. + * StorageImpl definitions. * - * This implementation of the IStorage32 interface represents a root + * This implementation of the IStorage interface represents a root * storage. Basically, a document file. */ struct StorageImpl

1 0