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

Aaryaman Vasishta : d3drm: Add stubs for IDirect3DRMTexture methods.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 9eb5361d5aaa63ffef637e7cc405d7a030b32fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb5361d5aaa63ffef637e7cc… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Aug 24 19:46:38 2015 +0530 d3drm: Add stubs for IDirect3DRMTexture methods. --- dlls/d3drm/texture.c | 312 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 307 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9eb5361d5aaa63ffef637…

1 0

Jacek Caban : d3d11.idl: Added some missing declarations.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 4ca5a3567005ff000ddbc6ed21728ca65598cc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca5a3567005ff000ddbc6ed2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 12:27:52 2015 +0200 d3d11.idl: Added some missing declarations. --- include/d3d11.idl | 393 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 393 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ca5a3567005ff000ddbc…

1 0

Jacek Caban : ntdll: Added new pid debug channel to append process id to debug output.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 719a7d32c5f016084e254df29f32e3cba6f634de URL: http://source.winehq.org/git/wine.git/?a=commit;h=719a7d32c5f016084e254df29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 12:31:21 2015 +0200 ntdll: Added new pid debug channel to append process id to debug output. --- dlls/ntdll/debugtools.c | 3 +++ libs/wine/debug.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index cbbf744..eb43224 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -39,6 +39,7 @@ #include "ntdll_misc.h" WINE_DECLARE_DEBUG_CHANNEL(tid); +WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(timestamp); static struct __wine_debug_functions default_funcs; @@ -170,6 +171,8 @@ static int NTDLL_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_chan ULONG ticks = NtGetTickCount(); ret = wine_dbg_printf( "%3u.%03u:", ticks / 1000, ticks % 1000 ); } + if (TRACE_ON(pid)) + ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); if (TRACE_ON(tid)) ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); if (cls < sizeof(classes)/sizeof(classes[0])) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 548ef22..8b04ef9 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -35,6 +35,7 @@ #if defined(__MINGW32__) || defined(_MSC_VER) WINE_DECLARE_DEBUG_CHANNEL(tid); +WINE_DECLARE_DEBUG_CHANNEL(pid); #endif static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; @@ -407,6 +408,8 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch int ret = 0; #if defined(__MINGW32__) || defined(_MSC_VER) + if (TRACE_ON(pid)) + ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); if (TRACE_ON(tid)) ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); #endif

1 0

Henri Verbeet : d3d10core: Get rid of some redundant includes.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 662cfd41443cd3e47edf2a99cb7ebb95b67f00f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=662cfd41443cd3e47edf2a99c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 12:48:45 2015 +0200 d3d10core: Get rid of some redundant includes. d3d11.h includes d3d10_1.h, which includes d3d10.h. --- dlls/d3d10core/d3d10core_main.c | 1 - dlls/d3d10core/tests/device.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index fec2786..44f1e29 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -22,7 +22,6 @@ #include "initguid.h" #define COBJMACROS -#include "d3d10_1.h" #include "d3d11.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 47719e4..b35801c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -18,7 +18,6 @@ #define COBJMACROS #include "initguid.h" -#include "d3d10.h" #include "d3d11.h" #include "wine/test.h" #include <limits.h>

1 0

Henri Verbeet : d3d11: Get rid of a redundant include.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 1a23e2fa0b7aafc1d24ea1a9ba85d418e919329b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a23e2fa0b7aafc1d24ea1a9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 12:48:46 2015 +0200 d3d11: Get rid of a redundant include. d3d11_1.h includes d3d11.h, which includes d3d10_1.h. --- dlls/d3d11/d3d11_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index f7f6729..98c0eb1 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -29,7 +29,6 @@ #include "winuser.h" #include "objbase.h" -#include "d3d10_1.h" #include "d3d11_1.h" #ifdef D3D11_INIT_GUID #include "initguid.h"

1 0

Henri Verbeet : d3d11: Make "layers" static in D3D11CoreRegisterLayers().
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: b87eb8d94722c021105f28f8487ed9ec992d670d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b87eb8d94722c021105f28f84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 12:48:47 2015 +0200 d3d11: Make "layers" static in D3D11CoreRegisterLayers(). --- dlls/d3d11/d3d11_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index e3d09a1..40c4a5f 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -103,7 +103,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba HRESULT WINAPI D3D11CoreRegisterLayers(void) { - const struct dxgi_device_layer layers[] = + static const struct dxgi_device_layer layers[] = { {DXGI_DEVICE_LAYER_D3D10_DEVICE, layer_init, layer_get_size, layer_create}, };

1 0

Henri Verbeet : d3d11: Use the IUnknown implementation from the d3d11 interface.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 2edc9584ba9bd95399e9bdeb2559ee54dede6fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2edc9584ba9bd95399e9bdeb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 12:48:48 2015 +0200 d3d11: Use the IUnknown implementation from the d3d11 interface. Mostly just for consistency with other D3D code. --- dlls/d3d11/device.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 049989e..3a1b573 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -44,15 +44,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *ifa TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_ID3D10Device1) - || IsEqualGUID(riid, &IID_ID3D10Device) + if (IsEqualGUID(riid, &IID_ID3D11Device) || IsEqualGUID(riid, &IID_IUnknown)) { - *out = &device->ID3D10Device1_iface; + *out = &device->ID3D11Device_iface; } - else if (IsEqualGUID(riid, &IID_ID3D11Device)) + else if (IsEqualGUID(riid, &IID_ID3D10Device1) + || IsEqualGUID(riid, &IID_ID3D10Device)) { - *out = &device->ID3D11Device_iface; + *out = &device->ID3D10Device1_iface; } else if (IsEqualGUID(riid, &IID_ID3D10Multithread)) {

1 0

Henri Verbeet : d2d1: Avoid leaking "object" on an error path in d2d_factory_CreateWicBitmapRenderTarget() (Coverity).
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: bdaa571c5d7dd59dd28fd1f25cdad5761bfaf4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdaa571c5d7dd59dd28fd1f25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 12:48:49 2015 +0200 d2d1: Avoid leaking "object" on an error path in d2d_factory_CreateWicBitmapRenderTarget() (Coverity). --- dlls/d2d1/factory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 24407f7..d63add5 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -239,6 +239,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa D3D10_CREATE_DEVICE_BGRA_SUPPORT, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &factory->wic_device))) { WARN("Failed to create device, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); return hr; }

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: c527318efb8515e2d33b864a88155b164289df5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c527318efb8515e2d33b864a8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 24 23:02:43 2015 +0800 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 77 +++++++++++++++++-------------------------------------------- 1 file changed, 21 insertions(+), 56 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 85f0917..8e3ed64 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3147,10 +3147,8 @@ msgid "&View Source" msgstr "Ver Código Fo&nte" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "Propriedades" +msgstr "&Propriedades" #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104 @@ -7464,10 +7462,8 @@ msgid "Add Control" msgstr "Adicionar Controle" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "&Fonte..." +msgstr "&Converter..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8591,10 +8587,8 @@ msgid "Duplex:" msgstr "Frente e verso:" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "&Configurar" +msgstr "Configurar" #: wininet.rc:42 wininet.rc:62 msgid "Realm" @@ -8922,16 +8916,12 @@ msgstr "" "em disco suficiente ou que ainda esteja conectado a rede." #: winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." msgstr "" "Não é possível encontrar o dispositivo especificado. Certifique-se que está " -"instalado ou que o nome do dispositivo foi escrito corretamente." +"instalado e que o nome do dispositivo foi escrito corretamente." #: winmm.rc:87 msgid "" @@ -9252,16 +9242,12 @@ msgstr "" "espaço em disco suficiente ou que ainda esteja conectado na rede." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Instalador Wine Mono" +msgstr "Mapeador de Som do Wine" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "coluna" +msgstr "Volume" #: winmm.rc:138 msgid "Master Volume" @@ -9798,7 +9784,6 @@ msgstr "" "MOVE falhará se o local antigo e o novo local estão em unidades diferentes.\n" #: cmd.rc:142 -#, fuzzy msgid "" "PATH displays or changes the cmd search path.\n" "\n" @@ -9813,8 +9798,8 @@ msgstr "" "PATH mostra ou permite mudar o caminho de busca de programas do cmd.\n" "\n" "Digitando PATH mostrará a atual configuração do comando PATH (inicialmente\n" -"este valor é especificado no arquivo wine.conf). Para mudar as\n" -"configurações, digite novos valores no comando PATH.\n" +"lido do registro). Para mudar as configurações digite novos valores no " +"comando PATH.\n" "\n" "Também é possível modificar o comando PATH usando a variável de ambiente\n" "PATH, por exemplo:\n" @@ -11595,10 +11580,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Erro: Parâmetros da linha de comandos inválidos\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Erro: Incapaz de adicionar chaves à máquina remota\n" +msgstr "Erro: Não foi possível acessar a máquina remota\n" #: reg.rc:38 msgid "" @@ -11608,10 +11591,8 @@ msgstr "" "especificado\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Tipo não suportado.\n" +msgstr "Erro: Tipo não suportado.\n" #: regedit.rc:34 msgid "&Registry" @@ -12946,10 +12927,8 @@ msgid "" msgstr "" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Erro: Opção inválida '%c'.\n" +msgstr "uninstaller: Opção inválida [%1].\n" #: uninstaller.rc:35 msgid "" @@ -13239,10 +13218,8 @@ msgid "&Test Sound" msgstr "&Testar Som" #: winecfg.rc:277 winecfg.rc:90 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Configuração do Wine" +msgstr "Configuração dos alto-falantes" #: winecfg.rc:280 msgid "Speakers:" @@ -13354,21 +13331,19 @@ msgstr "(Padrão do sistema)" #: winecfg.rc:91 msgid "5.1 Surround" -msgstr "" +msgstr "Surround 5.1" #: winecfg.rc:92 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "gráfico" +msgstr "Quadrafônico" #: winecfg.rc:93 msgid "Stereo" -msgstr "" +msgstr "Estéreo" #: winecfg.rc:94 msgid "Mono" -msgstr "" +msgstr "Mono" #: winecfg.rc:54 msgid "" @@ -13629,16 +13604,12 @@ msgid "Command history" msgstr "Histórico de comandos" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Zona do buffer" +msgstr "Tamanho do &buffer:" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "&Remover duplicados" +msgstr "Remover &duplicados" #: wineconsole.rc:74 msgid "Popup menu" @@ -13653,22 +13624,16 @@ msgid "S&hift" msgstr "&Rotação" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "&Fechar o console" +msgstr "Console" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Edição rápida" +msgstr "Modo de &edição rápida" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "&Modo Experiente" +msgstr "Modo de &inserção" #: wineconsole.rc:88 msgid "&Font"

1 0

Józef Kucia : d3dx9: Fix typo in DDS_WIDTH define.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: ba53012fcfa90c666fa4b9a73ae0d4527c75187c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba53012fcfa90c666fa4b9a73… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 20 00:35:07 2015 +0200 d3dx9: Fix typo in DDS_WIDTH define. --- dlls/d3dx9_36/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 295ef63..6150575 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -77,7 +77,7 @@ static const GUID *d3dformat_to_wic_guid(D3DFORMAT format) /* dds_header.flags */ #define DDS_CAPS 0x1 #define DDS_HEIGHT 0x2 -#define DDS_WIDTH 0x2 +#define DDS_WIDTH 0x4 #define DDS_PITCH 0x8 #define DDS_PIXELFORMAT 0x1000 #define DDS_MIPMAPCOUNT 0x20000

1 0