wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Józef Kucia : d3dx9: Use D3DFMT constants instead of MAKEFOURCC codes.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: ece3af7855f0d13d487719c5693b9e8fa27ad38e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece3af7855f0d13d487719c56… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 20 00:35:10 2015 +0200 d3dx9: Use D3DFMT constants instead of MAKEFOURCC codes. --- dlls/d3dx9_36/surface.c | 18 +++++++++--------- dlls/d3dx9_36/tests/surface.c | 32 ++++++++++++++++---------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index c7ed74b..b8bb710 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -146,15 +146,15 @@ static D3DFORMAT dds_fourcc_to_d3dformat(DWORD fourcc) { unsigned int i; static const DWORD known_fourcc[] = { - MAKEFOURCC('U','Y','V','Y'), - MAKEFOURCC('Y','U','Y','2'), - MAKEFOURCC('R','G','B','G'), - MAKEFOURCC('G','R','G','B'), - MAKEFOURCC('D','X','T','1'), - MAKEFOURCC('D','X','T','2'), - MAKEFOURCC('D','X','T','3'), - MAKEFOURCC('D','X','T','4'), - MAKEFOURCC('D','X','T','5'), + D3DFMT_UYVY, + D3DFMT_YUY2, + D3DFMT_R8G8_B8G8, + D3DFMT_G8R8_G8B8, + D3DFMT_DXT1, + D3DFMT_DXT2, + D3DFMT_DXT3, + D3DFMT_DXT4, + D3DFMT_DXT5, D3DFMT_R16F, D3DFMT_G16R16F, D3DFMT_A16B16G16R16F, diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index f2cc3bc..1697a03 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -318,19 +318,19 @@ static void test_dds_header_handling(void) { { 32, DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, DDS_PITCH, 4, 4, -1 /* pitch */, 0, 64, { D3D_OK, 1 } }, /* linear size is ignored */ - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, 0, 4, 4, 0, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, 0, 4, 4, 0, 0, 7 /* pixel data size */, { D3DXERR_INVALIDDATA, 1 } }, - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 0 /* linear size */, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 0 /* linear size */, 0, 8, { D3D_OK, 1 } }, - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 1 /* linear size */, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 1 /* linear size */, 0, 8, { D3D_OK, 1 } }, - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 2 /* linear size */, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 2 /* linear size */, 0, 8, { D3D_OK, 1 } }, - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 9 /* linear size */, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 9 /* linear size */, 0, 8, { D3D_OK, 1 } }, - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 16 /* linear size */, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, 16 /* linear size */, 0, 8, { D3D_OK, 1 } }, - { { 32, DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, -1 /* linear size */, 0, + { { 32, DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0 }, DDS_LINEARSIZE, 4, 4, -1 /* linear size */, 0, 8, { D3D_OK, 1 } }, /* integer overflows */ { { 32, DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0 }, 0, 0x80000000, 0x80000000 /* 0x80000000 * 0x80000000 * 4 = 0 */, 0, 0, @@ -610,15 +610,15 @@ static void test_D3DXGetImageInfo(void) ok(info.ImageFileFormat == D3DXIFF_DDS, "Got image file format %#x, expected %#x\n", info.ImageFileFormat, D3DXIFF_DDS); } else skip("Couldn't get image info from volume map in memory\n"); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0, D3DFMT_DXT1); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','2'), 0, 0, 0, 0, 0, D3DFMT_DXT2); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','3'), 0, 0, 0, 0, 0, D3DFMT_DXT3); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','4'), 0, 0, 0, 0, 0, D3DFMT_DXT4); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','5'), 0, 0, 0, 0, 0, D3DFMT_DXT5); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('R','G','B','G'), 0, 0, 0, 0, 0, D3DFMT_R8G8_B8G8); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('G','R','G','B'), 0, 0, 0, 0, 0, D3DFMT_G8R8_G8B8); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('U','Y','V','Y'), 0, 0, 0, 0, 0, D3DFMT_UYVY); - check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('Y','U','Y','2'), 0, 0, 0, 0, 0, D3DFMT_YUY2); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_DXT1, 0, 0, 0, 0, 0, D3DFMT_DXT1); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_DXT2, 0, 0, 0, 0, 0, D3DFMT_DXT2); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_DXT3, 0, 0, 0, 0, 0, D3DFMT_DXT3); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_DXT4, 0, 0, 0, 0, 0, D3DFMT_DXT4); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_DXT5, 0, 0, 0, 0, 0, D3DFMT_DXT5); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_R8G8_B8G8, 0, 0, 0, 0, 0, D3DFMT_R8G8_B8G8); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_G8R8_G8B8, 0, 0, 0, 0, 0, D3DFMT_G8R8_G8B8); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_UYVY, 0, 0, 0, 0, 0, D3DFMT_UYVY); + check_dds_pixel_format(DDS_PF_FOURCC, D3DFMT_YUY2, 0, 0, 0, 0, 0, D3DFMT_YUY2); check_dds_pixel_format(DDS_PF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0, D3DFMT_R5G6B5); check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000, D3DFMT_A1R5G5B5); check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000, D3DFMT_A4R4G4B4);

1 0

Józef Kucia : d3dx9/tests: Add tests for DDS file format size validation.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 520deb14d28f80bf3c98c6d4e3aaac2e83f645db URL: http://source.winehq.org/git/wine.git/?a=commit;h=520deb14d28f80bf3c98c6d4e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 20 00:35:09 2015 +0200 d3dx9/tests: Add tests for DDS file format size validation. --- dlls/d3dx9_36/tests/surface.c | 178 +++++++++++++++++++++++++++++------------- 1 file changed, 122 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=520deb14d28f80bf3c98c…

1 0

Józef Kucia : d3dx9: Fix miplevels handling for DDS file format.
by Alexandre Julliard 25 Aug '15

25 Aug '15

Module: wine Branch: master Commit: 853be6e1d86b7a23d16b59d5c9cb75095a9645c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=853be6e1d86b7a23d16b59d5c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 20 00:35:08 2015 +0200 d3dx9: Fix miplevels handling for DDS file format. --- 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 6150575..c7ed74b 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -390,7 +390,7 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG info->Width = header->width; info->Height = header->height; info->Depth = 1; - info->MipLevels = (header->flags & DDS_MIPMAPCOUNT) ? header->miplevels : 1; + info->MipLevels = header->miplevels ? header->miplevels : 1; info->Format = dds_pixel_format_to_d3dformat(&header->pixel_format); if (info->Format == D3DFMT_UNKNOWN)

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

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 : d3d11/tests: Add test for D3D11CreateDevice.
by Alexandre Julliard 24 Aug '15

24 Aug '15

Module: wine Branch: master Commit: 6038e2ab7957b65dd2e13ddd414c206718fb14b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6038e2ab7957b65dd2e13ddd4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 24 01:04:27 2015 +0200 d3d11/tests: Add test for D3D11CreateDevice. --- dlls/d3d11/tests/d3d11.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0595ead..f313806 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -21,6 +21,12 @@ #include "d3d11.h" #include "wine/test.h" +static ULONG get_refcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + static ID3D11Device *create_device(D3D_FEATURE_LEVEL feature_level) { ID3D11Device *device; @@ -38,6 +44,52 @@ static ID3D11Device *create_device(D3D_FEATURE_LEVEL feature_level) return NULL; } +static void test_create_device(void) +{ + D3D_FEATURE_LEVEL feature_level, supported_feature_level; + ID3D11DeviceContext *immediate_context = NULL; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &device, + NULL, NULL); + if (FAILED(hr)) + { + skip("Failed to create HAL device, skipping tests.\n"); + return; + } + + supported_feature_level = ID3D11Device_GetFeatureLevel(device); + ID3D11Device_Release(device); + + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, + &feature_level, NULL); + ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + feature_level, supported_feature_level); + + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, + &immediate_context); + ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + + todo_wine ok(!!immediate_context, "Immediate context is NULL.\n"); + if (!immediate_context) return; + + refcount = get_refcount((IUnknown *)immediate_context); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + ID3D11DeviceContext_GetDevice(immediate_context, &device); + refcount = ID3D11Device_Release(device); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + refcount = ID3D11DeviceContext_Release(immediate_context); + ok(!refcount, "ID3D11DeviceContext has %u references left.\n", refcount); +} + static void test_device_interfaces(void) { static const D3D_FEATURE_LEVEL feature_levels[] = @@ -96,5 +148,6 @@ static void test_device_interfaces(void) START_TEST(d3d11) { + test_create_device(); test_device_interfaces(); }

1 0

Józef Kucia : d3d11: Allow to pass NULL as device to D3D11CreateDevice.
by Alexandre Julliard 24 Aug '15

24 Aug '15

Module: wine Branch: master Commit: 4cf1bb929fad3b898050ae8d305e5c8a8948ca2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf1bb929fad3b898050ae8d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 24 01:04:26 2015 +0200 d3d11: Allow to pass NULL as device to D3D11CreateDevice. --- dlls/d3d11/d3d11_main.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 00634c4..e3d09a1 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -145,16 +145,17 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte } HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, - const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) { IDXGIFactory *factory; + ID3D11Device *device; HRESULT hr; TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %u, sdk_version %u, " "device %p, obtained_feature_level %p, immediate_context %p.\n", adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version, - device, obtained_feature_level, immediate_context); + device_out, obtained_feature_level, immediate_context); if (adapter) { @@ -237,7 +238,7 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t } } - hr = D3D11CoreCreateDevice(factory, adapter, flags, feature_levels, levels, device); + hr = D3D11CoreCreateDevice(factory, adapter, flags, feature_levels, levels, &device); IDXGIAdapter_Release(adapter); IDXGIFactory_Release(factory); if (FAILED(hr)) @@ -246,15 +247,20 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t return hr; } - TRACE("Created ID3D11Device %p.\n", *device); + TRACE("Created ID3D11Device %p.\n", device); if (obtained_feature_level) - *obtained_feature_level = ID3D11Device_GetFeatureLevel(*device); + *obtained_feature_level = ID3D11Device_GetFeatureLevel(device); if (immediate_context) - ID3D11Device_GetImmediateContext(*device, immediate_context); + ID3D11Device_GetImmediateContext(device, immediate_context); - return hr; + if (device_out) + *device_out = device; + else + ID3D11Device_Release(device); + + return S_OK; } HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type,

1 0

Józef Kucia : d3d10core/tests: Add test for device feature level.
by Alexandre Julliard 24 Aug '15

24 Aug '15

Module: wine Branch: master Commit: 66b2d96a69f5c0e74980d7d66a1f36ca4ed160ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b2d96a69f5c0e74980d7d66… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 24 01:04:25 2015 +0200 d3d10core/tests: Add test for device feature level. --- dlls/d3d10core/tests/device.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index bdceb9b..47719e4 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -19,6 +19,7 @@ #define COBJMACROS #include "initguid.h" #include "d3d10.h" +#include "d3d11.h" #include "wine/test.h" #include <limits.h> @@ -171,6 +172,37 @@ static IDXGISwapChain *create_swapchain(ID3D10Device *device, HWND window, BOOL return swapchain; } +static void test_feature_level(void) +{ + D3D_FEATURE_LEVEL feature_level; + ID3D11Device *device11; + ID3D10Device *device10; + HRESULT hr; + + if (!(device10 = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_QueryInterface(device10, &IID_ID3D11Device, (void **)&device11); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Failed to query ID3D11Device interface, hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("D3D11 is not available.\n"); + ID3D10Device_Release(device10); + return; + } + + /* Device was created by D3D10CreateDevice. */ + feature_level = ID3D11Device_GetFeatureLevel(device11); + ok(feature_level == D3D_FEATURE_LEVEL_10_0, "Got unexpected feature level %#x.\n", feature_level); + + ID3D11Device_Release(device11); + ID3D10Device_Release(device10); +} + static void test_create_texture2d(void) { ULONG refcount, expected_refcount; @@ -3432,6 +3464,7 @@ static void test_update_subresource(void) START_TEST(device) { + test_feature_level(); test_create_texture2d(); test_create_texture3d(); test_create_depthstencil_view();

1 0

Józef Kucia : d3d11/tests: Add test for device interfaces.
by Alexandre Julliard 24 Aug '15

24 Aug '15

Module: wine Branch: master Commit: 9af58dc110e9f955209f422503ed249c08c81496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af58dc110e9f955209f42250… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 24 01:04:24 2015 +0200 d3d11/tests: Add test for device interfaces. --- configure | 1 + configure.ac | 1 + dlls/d3d11/tests/Makefile.in | 5 +++ dlls/d3d11/tests/d3d11.c | 100 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+) diff --git a/configure b/configure index b12b7e3..005533d 100755 --- a/configure +++ b/configure @@ -17236,6 +17236,7 @@ wine_fn_config_dll d3d10_1 enable_d3d10_1 implib wine_fn_config_dll d3d10core enable_d3d10core implib wine_fn_config_test dlls/d3d10core/tests d3d10core_test wine_fn_config_dll d3d11 enable_d3d11 implib +wine_fn_config_test dlls/d3d11/tests d3d11_test wine_fn_config_dll d3d8 enable_d3d8 implib wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 implib diff --git a/configure.ac b/configure.ac index 0276a1c..004e79d 100644 --- a/configure.ac +++ b/configure.ac @@ -2837,6 +2837,7 @@ WINE_CONFIG_DLL(d3d10_1,,[implib]) WINE_CONFIG_DLL(d3d10core,,[implib]) WINE_CONFIG_TEST(dlls/d3d10core/tests) WINE_CONFIG_DLL(d3d11,,[implib]) +WINE_CONFIG_TEST(dlls/d3d11/tests) WINE_CONFIG_DLL(d3d8,,[implib]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[implib]) diff --git a/dlls/d3d11/tests/Makefile.in b/dlls/d3d11/tests/Makefile.in new file mode 100644 index 0000000..d977d31 --- /dev/null +++ b/dlls/d3d11/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = d3d11.dll +IMPORTS = d3d11 + +C_SRCS = \ + d3d11.c diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c new file mode 100644 index 0000000..0595ead --- /dev/null +++ b/dlls/d3d11/tests/d3d11.c @@ -0,0 +1,100 @@ +/* + * Copyright 2015 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "initguid.h" +#include "d3d11.h" +#include "wine/test.h" + +static ID3D11Device *create_device(D3D_FEATURE_LEVEL feature_level) +{ + ID3D11Device *device; + + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, &feature_level, 1, D3D11_SDK_VERSION, + &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, &feature_level, 1, D3D11_SDK_VERSION, + &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, &feature_level, 1, D3D11_SDK_VERSION, + &device, NULL, NULL))) + return device; + + return NULL; +} + +static void test_device_interfaces(void) +{ + static const D3D_FEATURE_LEVEL feature_levels[] = + { + D3D_FEATURE_LEVEL_11_1, + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + D3D_FEATURE_LEVEL_9_3, + D3D_FEATURE_LEVEL_9_2, + D3D_FEATURE_LEVEL_9_1 + }; + ID3D11Device *device; + IUnknown *iface; + ULONG refcount; + unsigned int i; + HRESULT hr; + + for (i = 0; i < sizeof(feature_levels) / sizeof(*feature_levels); i++) + { + if (!(device = create_device(feature_levels[i]))) + { + skip("Failed to create device for feature level %#x, skipping tests.\n", feature_levels[i]); + continue; + } + + hr = ID3D11Device_QueryInterface(device, &IID_IUnknown, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IUnknown interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIObject, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IDXGIObject interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IDXGIDevice interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Device, (void **)&iface); + todo_wine ok(hr == E_NOINTERFACE, "Device should not implement ID3D10Device interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface); + todo_wine ok(hr == E_NOINTERFACE, "Device should not implement ID3D10Device1 interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } +} + +START_TEST(d3d11) +{ + test_device_interfaces(); +}

1 0

Stefan Dösinger : ddraw: Return the right error if range color keys are used.
by Alexandre Julliard 24 Aug '15

24 Aug '15

Module: wine Branch: master Commit: 40c5303b62cfeb74860131a156b4e34c17f4d4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c5303b62cfeb74860131a15… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 23 21:59:35 2015 +0200 ddraw: Return the right error if range color keys are used. --- dlls/ddraw/surface.c | 30 ++++++++++-- dlls/ddraw/tests/ddraw1.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/cs.c | 4 +- dlls/wined3d/texture.c | 10 +--- include/wine/wined3d.h | 1 - 8 files changed, 497 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40c5303b62cfeb7486013…

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
51
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 August 2015