May 2013 - Wine-Commits - list.winehq.org

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

May 15, 2013

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 : inetmib1: Don't bother to free memory at process exit.
by Alexandre Julliard May 15, 2013

May 15, 2013

Module: wine Branch: master Commit: d6976d7e009927357220be0429beb336d20bad3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6976d7e009927357220be042… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:20:16 2013 +0200 inetmib1: Don't bother to free memory at process exit. --- dlls/inetmib1/main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 20d8006..c0719c1 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -1454,10 +1454,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; cleanup(); break; - default: - break; } return TRUE;

1 0

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

May 15, 2013

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 May 15, 2013

May 15, 2013

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

Lucas Zawacki : Portuguese translation for release 1.5.30
by Jeremy Newman May 15, 2013

May 15, 2013

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

Nikolay Sivov : comdlg32: Simplify more internal helpers.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 3dea8a69ec0ef0dfe82ec78c6ec0715443133be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dea8a69ec0ef0dfe82ec78c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 13:33:25 2013 +0400 comdlg32: Simplify more internal helpers. --- dlls/comdlg32/colordlg.c | 266 ++++++++++++++++++++++------------------------ 1 files changed, 127 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3dea8a69ec0ef0dfe82ec…

1 0

Alexandre Julliard : msi: Don' t bother to unregister classes at process exit.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: d578d0d6c3407f292151979e28b13230c871abbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d578d0d6c3407f292151979e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:18:37 2013 +0200 msi: Don't bother to unregister classes at process exit. --- dlls/msi/msi_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 46f9ed8..148e678 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -76,6 +76,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) IsWow64Process( GetCurrentProcess(), &is_wow64 ); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; msi_dialog_unregister_class(); msi_free_handle_table(); msi_free( gszLogFile );

1 0

Alexandre Julliard : inetcomm: Don' t bother to unregister classes at process exit.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 1b5114d9fc37992af5698c9b2eb17cb9404d80ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5114d9fc37992af5698c9b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:16:33 2013 +0200 inetcomm: Don't bother to unregister classes at process exit. --- dlls/inetcomm/inetcomm_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index 8f5eca6..9987a41 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -58,11 +58,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) MimeInternational_Construct(&international); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; IMimeInternational_Release(international); InternetTransport_UnregisterClass(hinstDLL); break; - default: - break; } return TRUE; }

1 0

Alexandre Julliard : comctl32: Don' t bother to unregister classes at process exit.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 1b4c1ab900b8d640a208fd83810eee44e306f7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4c1ab900b8d640a208fd838… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:13:04 2013 +0200 comctl32: Don't bother to unregister classes at process exit. --- dlls/comctl32/commctrl.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index c0d0043..f08288d 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -157,7 +157,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: - /* clean up subclassing */ + if (lpvReserved) break; + /* clean up subclassing */ THEMING_Uninitialize(); /* unregister all common control classes */ @@ -185,14 +186,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /* delete local pattern brush */ DeleteObject (COMCTL32_hPattern55AABrush); - COMCTL32_hPattern55AABrush = NULL; DeleteObject (COMCTL32_hPattern55AABitmap); - COMCTL32_hPattern55AABitmap = NULL; /* delete global subclassing atom */ GlobalDeleteAtom (LOWORD(COMCTL32_wSubclass)); TRACE("Subclassing atom deleted: %p\n", COMCTL32_wSubclass); - COMCTL32_wSubclass = NULL; break; }

1 0

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

May 14, 2013

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