wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Alexandre Julliard : dxgi: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 575d0e60142aaa0e0a0c6ae78eb79b5e37e6e5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=575d0e60142aaa0e0a0c6ae78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:18:37 2013 +0200 dxgi: Don't bother to free memory at process exit. --- dlls/dxgi/dxgi_main.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index c9d6f2e..e9ed482 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -44,16 +44,8 @@ static struct dxgi_main dxgi_main; static void dxgi_main_cleanup(void) { - EnterCriticalSection(&dxgi_cs); - HeapFree(GetProcessHeap(), 0, dxgi_main.device_layers); - dxgi_main.device_layers = NULL; - dxgi_main.layer_count = 0; - FreeLibrary(dxgi_main.d3d10core); - dxgi_main.d3d10core = NULL; - - LeaveCriticalSection(&dxgi_cs); DeleteCriticalSection(&dxgi_cs); } @@ -68,6 +60,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) break; case DLL_PROCESS_DETACH: + if (lpv) break; dxgi_main_cleanup(); break; }

1 0

Alexandre Julliard : dwrite: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 14f7900b8dfc51d276b2f3020d493607360f3700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f7900b8dfc51d276b2f3020… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:17:03 2013 +0200 dwrite: Don't bother to free memory at process exit. --- dlls/dwrite/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index da023d9..d253c42 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -44,6 +44,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) DisableThreadLibraryCalls( hinstDLL ); break; case DLL_PROCESS_DETACH: + if (reserved) break; release_system_fontcollection(); break; }

1 0

Alexandre Julliard : crypt32: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 99bf9ee8e0b3665aae175be56acaf53b3b6111d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99bf9ee8e0b3665aae175be56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:16:05 2013 +0200 crypt32: Don't bother to free memory at process exit. --- dlls/crypt32/main.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index db9dc1a..78f14f9 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -45,14 +45,12 @@ BOOL WINAPI DllMain(HINSTANCE hInst, DWORD fdwReason, PVOID pvReserved) crypt_oid_init(); break; case DLL_PROCESS_DETACH: + if (pvReserved) break; crypt_oid_free(); crypt_sip_free(); root_store_free(); default_chain_engine_free(); - /* Don't release the default provider on process shutdown, there's - * no guarantee the provider dll hasn't already been unloaded. - */ - if (hDefProv && !pvReserved) CryptReleaseContext(hDefProv, 0); + if (hDefProv) CryptReleaseContext(hDefProv, 0); break; } return TRUE;

1 0

Alexandre Julliard : credui: Don't bother to free memory at process exit.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 0f3523b101a0d59024f4fb349b139a41bf2c7021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3523b101a0d59024f4fb349… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:15:39 2013 +0200 credui: Don't bother to free memory at process exit. --- dlls/credui/credui_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 6e8d452..c7b2da4 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -80,6 +80,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; LIST_FOR_EACH_ENTRY_SAFE(entry, cursor2, &pending_credentials_list, struct pending_credentials, entry) { list_remove(&entry->entry);

1 0

Lucas Zawacki : Portuguese translation for release 1.5.30
by Jeremy Newman 15 May '13

15 May '13

Module: website Branch: master Commit: fa22bc048033624bc401a6710139dd7e74796026 URL: http://source.winehq.org/git/website.git/?a=commit;h=fa22bc048033624bc401a6… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Wed May 15 12:55:06 2013 -0300 Portuguese translation for release 1.5.30 --- news/pt/2013051001.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/pt/2013051001.xml b/news/pt/2013051001.xml new file mode 100644 index 0000000..6745efd --- /dev/null +++ b/news/pt/2013051001.xml @@ -0,0 +1,14 @@ +<news> +<date>10 de Maio de 2013</date> +<title>Wine 1.5.30 lançado</title> +<body> + A versão de desenvolvimento 1.5.30 já está disponível agora. + <a href="{$root}/announce/1.5.30">Novidades</a> desta versão: +<ul> + <li>Suporte à captura de mouse no driver de Mac.</li> + <li>Autenticação NTLM e negociada no WinHTTP.</li> + <li>Suporte a contorno (bypass) de proxy no WinInet.</li> + <li>Várias correções de bugs</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.30.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Christian Costa : d3dx9_36: Fix D3DXCheckTextureRequirements to return D3DFMT_A8R8G8B8 when d3d doesn' t support D3DFMT_P8 + tests.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: a131d714ffb0c0dd9415e6b3b382b01818fa41cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a131d714ffb0c0dd9415e6b3b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 12 23:57:58 2013 +0200 d3dx9_36: Fix D3DXCheckTextureRequirements to return D3DFMT_A8R8G8B8 when d3d doesn't support D3DFMT_P8 + tests. --- dlls/d3dx9_36/tests/texture.c | 11 +++++++++++ dlls/d3dx9_36/util.c | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 782864c..fd072c8 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -329,6 +329,17 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(format == expected, "Returned format %u, expected %u\n", format, expected); + if(SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_P8))) + expected = D3DFMT_P8; + else + expected = D3DFMT_A8R8G8B8; + + format = D3DFMT_P8; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == expected, "Returned format %u, expected %u\n", format, expected); + IDirect3D9_Release(d3d); } diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 9ba54e2..376fe89 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -73,6 +73,7 @@ static const struct pixel_format_desc formats[] = {D3DFMT_DXT5, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, {D3DFMT_A16B16G16R16F, {16, 16, 16, 16}, {48, 0, 16, 32}, 8, 1, 1, 8, FORMAT_ARGBF16, NULL, NULL }, {D3DFMT_A32B32G32R32F, {32, 32, 32, 32}, {96, 0, 32, 64}, 16, 1, 1, 16, FORMAT_ARGBF, NULL, NULL }, + {D3DFMT_P8, { 8, 8, 8, 8}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_UNKNOWN, NULL, NULL }, /* marks last element */ {D3DFMT_UNKNOWN, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 0, 1, 1, 0, FORMAT_UNKNOWN, NULL, NULL }, };

1 0

Christian Costa : d3dx9_36: Report D3DFMT_P8 for image with indexed colors in D3DGetImageInfoFromFileInMemory .
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: aa1d24f09bd78ebfc5c15438f3de1602b5dd6f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa1d24f09bd78ebfc5c15438f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 12 23:57:50 2013 +0200 d3dx9_36: Report D3DFMT_P8 for image with indexed colors in D3DGetImageInfoFromFileInMemory. --- dlls/d3dx9_36/surface.c | 6 +++--- dlls/d3dx9_36/tests/surface.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 81bdd78..82ead60 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -37,9 +37,9 @@ static const struct const GUID *wic_guid; D3DFORMAT d3dformat; } wic_pixel_formats[] = { - { &GUID_WICPixelFormat8bppIndexed, D3DFMT_L8 }, - { &GUID_WICPixelFormat1bppIndexed, D3DFMT_L8 }, - { &GUID_WICPixelFormat4bppIndexed, D3DFMT_L8 }, + { &GUID_WICPixelFormat8bppIndexed, D3DFMT_P8 }, + { &GUID_WICPixelFormat1bppIndexed, D3DFMT_P8 }, + { &GUID_WICPixelFormat4bppIndexed, D3DFMT_P8 }, { &GUID_WICPixelFormat16bppBGR555, D3DFMT_X1R5G5B5 }, { &GUID_WICPixelFormat16bppBGR565, D3DFMT_R5G6B5 }, { &GUID_WICPixelFormat24bppBGR, D3DFMT_R8G8B8 }, diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 15707f7..94242d1 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -481,17 +481,17 @@ static void test_D3DXGetImageInfo(void) hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, sizeof(bmp_1bpp), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); - todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); hr = D3DXGetImageInfoFromFileInMemory(bmp_2bpp, sizeof(bmp_2bpp), &info); ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); hr = D3DXGetImageInfoFromFileInMemory(bmp_4bpp, sizeof(bmp_4bpp), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); - todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); hr = D3DXGetImageInfoFromFileInMemory(bmp_8bpp, sizeof(bmp_8bpp), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); - todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); /* test DDS support */ hr = D3DXGetImageInfoFromFileInMemory(dds_24bit, sizeof(dds_24bit), &info); @@ -646,7 +646,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFile */ if(testbitmap_ok) { hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK); + todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileA(NULL, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -683,7 +683,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFileInMemory */ hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp_1bpp, sizeof(bmp_1bpp), NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, noimage, sizeof(noimage), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);

1 0

Maarten Lankhorst : devenum: Set FriendlyName and wave*ID for devices.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 604172dd986a6ff1da89cd6682ef9b8ceac639d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604172dd986a6ff1da89cd668… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 10 10:07:09 2013 +0200 devenum: Set FriendlyName and wave*ID for devices. --- dlls/devenum/createdevenum.c | 54 +++++++++++++++++++++++++++++++++++------- dlls/devenum/mediacatenum.c | 1 + 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 625ff62..b7e288b 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -52,6 +52,9 @@ static const WCHAR wszAllowedZero[] = {'A','l','l','o','w','e','d','Z','e','r',' static const WCHAR wszDirection[] = {'D','i','r','e','c','t','i','o','n',0}; static const WCHAR wszIsRendered[] = {'I','s','R','e','n','d','e','r','e','d',0}; static const WCHAR wszTypes[] = {'T','y','p','e','s',0}; +static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; +static const WCHAR wszWaveInID[] = {'W','a','v','e','I','n','I','D',0}; +static const WCHAR wszWaveOutID[] = {'W','a','v','e','O','u','t','I','D',0}; static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface); static HRESULT DEVENUM_CreateSpecialCategories(void); @@ -629,6 +632,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) WAVEINCAPSW wicaps; MIDIOUTCAPSW mocaps; REGPINTYPES * pTypes; + IPropertyBag * pPropBag = NULL; numDevs = waveOutGetNumDevs(); @@ -666,10 +670,24 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) wocaps.szPname, &rf2); - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - if (pMoniker) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_UNION(&var, ulVal) = i; + res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszWaveOutID, &var); + else + pPropBag = NULL; + + V_VT(&var) = VT_LPWSTR; + V_UNION(&var, bstrVal) = wocaps.szPname; + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); + if (pPropBag) + IPropertyBag_Release(pPropBag); IMoniker_Release(pMoniker); pMoniker = NULL; } @@ -725,7 +743,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) rfp2.lpMediaType = pTypes; - res = IFilterMapper2_RegisterFilter(pMapper, + res = IFilterMapper2_RegisterFilter(pMapper, &CLSID_AudioRecord, wicaps.szPname, &pMoniker, @@ -733,10 +751,27 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) wicaps.szPname, &rf2); - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - if (pMoniker) - IMoniker_Release(pMoniker); + if (pMoniker) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_UNION(&var, ulVal) = i; + res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszWaveInID, &var); + else + pPropBag = NULL; + + V_VT(&var) = VT_LPWSTR; + V_UNION(&var, bstrVal) = wicaps.szPname; + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); + + if (pPropBag) + IPropertyBag_Release(pPropBag); + IMoniker_Release(pMoniker); + } CoTaskMemFree(pTypes); } @@ -803,7 +838,6 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) szDeviceVersion, sizeof(szDeviceVersion)/sizeof(WCHAR))) { IMoniker * pMoniker = NULL; - IPropertyBag * pPropBag = NULL; WCHAR dprintf[] = { 'v','i','d','e','o','%','d',0 }; snprintfW(szDevicePath, sizeof(szDevicePath)/sizeof(WCHAR), dprintf, i); /* The above code prevents 1 device with a different ID overwriting another */ @@ -834,8 +868,10 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) V_VT(&var) = VT_I4; V_UNION(&var, ulVal) = i; res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); - if (SUCCEEDED(res)) - res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var); + if (SUCCEEDED(res)) { + res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var); + IPropertyBag_Release(pPropBag); + } IMoniker_Release(pMoniker); } diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 24d236d..60ba110 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -232,6 +232,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write( switch (V_VT(pVar)) { case VT_BSTR: + case VT_LPWSTR: TRACE("writing %s\n", debugstr_w(V_UNION(pVar, bstrVal))); lpData = V_UNION(pVar, bstrVal); dwType = REG_SZ;

1 0

Sergey Guralnik : explorer: Use comma as argument delimiter.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 4b9d81b4b52f311e0175a02fdbc83b0922311736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9d81b4b52f311e0175a02fd… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Tue May 14 15:11:28 2013 +0300 explorer: Use comma as argument delimiter. --- programs/explorer/explorer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index aa7303d..1df781c 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -643,7 +643,7 @@ static int copy_path_string(LPWSTR target, LPWSTR source) } else { - while (*source && !isspaceW(*source)) target[i++] = *source++; + while (*source && *source != ',') target[i++] = *source++; target[i] = 0; } return i;

1 0

Stefan Dösinger : wined3d: Disable the fixed function vertex pipeline when ARB vertex programs are used .
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 71723ad086c6f49b6bc367e86d3dc2944f6f13a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71723ad086c6f49b6bc367e86… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 14 17:38:20 2013 +0200 wined3d: Disable the fixed function vertex pipeline when ARB vertex programs are used. --- dlls/wined3d/arb_program_shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bfade73..ccd8ee3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4701,6 +4701,8 @@ static void shader_arb_select(void *shader_priv, const struct wined3d_context *c GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->current_vprogram_id)); checkGLcall("glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->current_vprogram_id);"); + priv->vertex_pipe->vp_enable(gl_info, FALSE); + /* Enable OpenGL vertex programs */ gl_info->gl_ops.gl.p_glEnable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);");

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
50
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 May 2013