September 2015 - Wine-Commits

Józef Kucia : dxgi/tests: Remove leftover debug comment.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: ef3afcf649411976ba754106a8c791c46ad5ce97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef3afcf649411976ba754106a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:40 2015 +0200 dxgi/tests: Remove leftover debug comment. --- dlls/dxgi/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 1e9507f..008da26 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1060,7 +1060,7 @@ static void test_swapchain_parameters(void) {TRUE, 0, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 0, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, /*10 */ + {TRUE, 0, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 1}, {TRUE, 3, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 2},

1 0

Józef Kucia : dxgi/tests: Add missing DestroyWindow() call in test_createswapchain().
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: 7d9049c2dfdbb9cd6e44bbcee5bc52ed79a2ee5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9049c2dfdbb9cd6e44bbcee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:39 2015 +0200 dxgi/tests: Add missing DestroyWindow() call in test_createswapchain(). --- dlls/dxgi/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index fe2c453..1e9507f 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -520,6 +520,7 @@ static void test_createswapchain(void) IUnknown_Release(obj); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(creation_desc.OutputWindow); } static void test_create_factory(void)

1 0

Józef Kucia : d3d10core/tests: Check that shader resource view implements ID3D11ShaderResourceView.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: 6d916dc3e5a4aeb432bc27ef11b7d6c4c465192c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d916dc3e5a4aeb432bc27ef1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:33 2015 +0200 d3d10core/tests: Check that shader resource view implements ID3D11ShaderResourceView. --- dlls/d3d10core/tests/device.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 836da96..ec835ab 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -887,6 +887,7 @@ static void test_create_shader_resource_view(void) ID3D10Device *device, *tmp; ID3D10Texture2D *texture; ID3D10Buffer *buffer; + IUnknown *iface; HRESULT hr; if (!(device = create_device())) @@ -925,6 +926,11 @@ static void test_create_shader_resource_view(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + hr = ID3D10ShaderResourceView_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D11ShaderResourceView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + ID3D10ShaderResourceView_Release(srview); ID3D10Buffer_Release(buffer); @@ -954,6 +960,11 @@ static void test_create_shader_resource_view(void) U(srv_desc).Texture2D.MostDetailedMip); ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + hr = ID3D10ShaderResourceView_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D11ShaderResourceView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + ID3D10ShaderResourceView_Release(srview); ID3D10Texture2D_Release(texture);

1 0

Józef Kucia : d3d10core/tests: Check that render target view implements ID3D11RenderTargetView.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: c32def6c4173c2ff4e2ba29ab44e58073e206e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32def6c4173c2ff4e2ba29ab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:32 2015 +0200 d3d10core/tests: Check that render target view implements ID3D11RenderTargetView. --- dlls/d3d10core/tests/device.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e24cc94..836da96 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -783,6 +783,7 @@ static void test_create_rendertarget_view(void) ID3D10Device *device, *tmp; ID3D10Texture2D *texture; ID3D10Buffer *buffer; + IUnknown *iface; HRESULT hr; if (!(device = create_device())) @@ -831,6 +832,11 @@ static void test_create_rendertarget_view(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + hr = ID3D10RenderTargetView_QueryInterface(rtview, &IID_ID3D11RenderTargetView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Render target view should implement ID3D11RenderTargetView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + ID3D10RenderTargetView_Release(rtview); ID3D10Buffer_Release(buffer); @@ -859,6 +865,11 @@ static void test_create_rendertarget_view(void) "Expected view dimension D3D10_RTV_DIMENSION_TEXTURE2D, got %#x\n", rtv_desc.ViewDimension); ok(U(rtv_desc).Texture2D.MipSlice == 0, "Expected mip slice 0, got %#x\n", U(rtv_desc).Texture2D.MipSlice); + hr = ID3D10RenderTargetView_QueryInterface(rtview, &IID_ID3D11RenderTargetView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Render target view should implement ID3D11RenderTargetView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + ID3D10RenderTargetView_Release(rtview); ID3D10Texture2D_Release(texture);

1 0

Katarzyna Caban : po: Update Polish translation.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: a833aaa5cea806763d3dfb6319428f667e2ed74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a833aaa5cea806763d3dfb631… Author: Katarzyna Caban <kasiatorek(a)gmail.com> Date: Sun Sep 13 17:54:46 2015 +0200 po: Update Polish translation. --- po/pl.po | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/po/pl.po b/po/pl.po index 3f2267e..f157402 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7469,16 +7469,12 @@ msgid "&Convert..." msgstr "&Konwertuj..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "&Obiekt" +msgstr "%1 &Obiekt %2" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%s &Object" -msgstr "&Obiekt" +msgstr "&Obiekt %s" #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -12909,18 +12905,16 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "usuwanie programów: Nie znaleziono aplikacji o GUID '%1'\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" -msgstr "" +msgstr "usuwanie programów: Po opcji '--remove' należy podać GUID aplikacji\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Błąd: Nieprawidłowa opcja '%c'.\n" +msgstr "usuwanie programów: Nieprawidłowa opcja [%1]\n" #: uninstaller.rc:35 msgid "" @@ -12929,6 +12923,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Wine - Usuwanie programów\n" +"\n" +"Usuń programy z bieżącego prefiksu Wine.\n" +"\n" #: uninstaller.rc:43 msgid "" @@ -12943,6 +12941,16 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"Sposób użycia:\n" +" uninstaller [opcje]\n" +"\n" +"Opcje:\n" +" --help\t Wyświetl tę instrukcję.\n" +" --list\t Wyświetl wszystkie aplikacje zainstalowane w tym prefiksie " +"Wine.\n" +" --remove {GUID} Usuń wskazaną aplikację.\n" +"\t\t Użyj '--list' do sprawdzenia GUID aplikacji.\n" +" [brak opcji] Uruchom graficzną wersję tego programu.\n" #: view.rc:36 msgid "&Pan"

1 0

Piotr Caban : msvcr120: Add fmin implementation.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: 09a727c33ca025b4b50172e872f04861df64213c URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a727c33ca025b4b50172e87… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Sep 12 14:29:00 2015 +0200 msvcr120: Add fmin implementation. --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c2aacac..0eb7ade 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2167,9 +2167,9 @@ @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf @ cdecl fmaxl(double double) MSVCR120_fmax -@ stub fmin -@ stub fminf -@ stub fminl +@ cdecl fmin(double double) MSVCR120_fmin +@ cdecl fminf(float float) MSVCR120_fminf +@ cdecl fminl(double double) MSVCR120_fmin @ cdecl fmod(double double) MSVCRT_fmod @ cdecl -arch=arm,x86_64 fmodf(float float) MSVCRT_fmodf @ cdecl fopen(str str) MSVCRT_fopen diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 392c3f7..ec97ad7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1836,9 +1836,9 @@ @ cdecl fmax(double double) msvcr120.fmax @ cdecl fmaxf(float float) msvcr120.fmaxf @ cdecl fmaxl(double double) msvcr120.fmaxl -@ stub fmin -@ stub fminf -@ stub fminl +@ cdecl fmin(double double) msvcr120.fmin +@ cdecl fminf(float float) msvcr120.fminf +@ cdecl fminl(double double) msvcr120.fminl @ cdecl fmod(double double) msvcr120.fmod @ cdecl -arch=arm,x86_64 fmodf(float float) msvcr120.fmodf @ cdecl fopen(str str) msvcr120.fopen diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 162dcfb..2459bf5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2683,3 +2683,31 @@ int CDECL MSVCR120__dsign(double x) { return signbit(x) ? 0x8000 : 0; } + +/********************************************************************* + * fminf (MSVCR120.@) + */ +float CDECL MSVCR120_fminf(float x, float y) +{ + if(isnanf(x)) + return y; + if(isnanf(y)) + return x; + if(x==0 && y==0) + return signbit(x) ? x : y; + return x<y ? x : y; +} + +/********************************************************************* + * fmin (MSVCR120.@) + */ +double CDECL MSVCR120_fmin(double x, double y) +{ + if(isnan(x)) + return y; + if(isnan(y)) + return x; + if(x==0 && y==0) + return signbit(x) ? x : y; + return x<y ? x : y; +}

1 0

Akihiro Sagawa : msi: Feature treeview should have WS_TABSTOP style.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: 6e51cfddfd722ef366fb2327b4ab84264aa19576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e51cfddfd722ef366fb2327b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Sep 12 20:24:22 2015 +0900 msi: Feature treeview should have WS_TABSTOP style. --- dlls/msi/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a79ce1f..64cbbbc 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2691,7 +2691,7 @@ static UINT msi_dialog_selection_tree( msi_dialog *dialog, MSIRECORD *rec ) /* create the treeview control */ style = TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT; - style |= WS_GROUP | WS_VSCROLL; + style |= WS_GROUP | WS_VSCROLL | WS_TABSTOP; control = msi_dialog_add_control( dialog, rec, WC_TREEVIEWW, style ); if (!control) {

1 0

Vincent Povirk : comdlg32: Return success from IFileDialog2::AddPlace.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: 4270a8a4dc55e2f99b5d1c721bdfbc778cf9e5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4270a8a4dc55e2f99b5d1c721… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 9 14:23:55 2015 -0500 comdlg32: Return success from IFileDialog2::AddPlace. --- dlls/comdlg32/itemdlg.c | 2 +- dlls/comdlg32/tests/itemdlg.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index e9d72cb..8ca3064 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2554,7 +2554,7 @@ static HRESULT WINAPI IFileDialog2_fnAddPlace(IFileDialog2 *iface, IShellItem *p { FileDialogImpl *This = impl_from_IFileDialog2(iface); FIXME("stub - %p (%p, %d)\n", This, psi, fdap); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI IFileDialog2_fnSetDefaultExtension(IFileDialog2 *iface, LPCWSTR pszDefaultExtension) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 5d8e410..45e9776 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -778,22 +778,19 @@ static void test_basics(void) IFileSaveDialog_AddPlace(pfsd, NULL, 0); } - todo_wine - { hr = IFileOpenDialog_AddPlace(pfod, psidesktop, FDAP_TOP + 1); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IFileOpenDialog_AddPlace(pfod, psidesktop, FDAP_BOTTOM); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileOpenDialog_AddPlace(pfod, psidesktop, FDAP_TOP); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileSaveDialog_AddPlace(pfsd, psidesktop, FDAP_TOP + 1); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IFileSaveDialog_AddPlace(pfsd, psidesktop, FDAP_BOTTOM); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileSaveDialog_AddPlace(pfsd, psidesktop, FDAP_TOP); ok(hr == S_OK, "got 0x%08x\n", hr); - } /* SetFileName */ hr = IFileOpenDialog_SetFileName(pfod, NULL);

1 0

Vincent Povirk : comdlg32: Remove fixme from EnableOpenDropDown.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: 3fc57e7b49a97816344d9706eec4b85550b88892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc57e7b49a97816344d9706e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 9 14:18:33 2015 -0500 comdlg32: Remove fixme from EnableOpenDropDown. --- dlls/comdlg32/itemdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index c8340df..e9d72cb 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -3582,7 +3582,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnEnableOpenDropDown(IFileDialogCusto { FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); MENUINFO mi; - FIXME("semi-stub - %p (%d)\n", This, dwIDCtl); + TRACE("%p (%d)\n", This, dwIDCtl); if (This->hmenu_opendropdown || get_cctrl(This, dwIDCtl)) return E_UNEXPECTED;

1 0

Vincent Povirk : comdlg32: Fix ignored out parameter.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: bbe009778ef8894bf70a5dacd6def04bbcb85477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe009778ef8894bf70a5dacd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 11 11:17:52 2015 -0500 comdlg32: Fix ignored out parameter. --- dlls/comdlg32/itemdlg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 8a52d71..c8340df 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -804,6 +804,8 @@ static HRESULT add_item(customctrl* parent, DWORD itemid, LPCWSTR label, cctrl_i item->cdcstate = CDCS_VISIBLE|CDCS_ENABLED; list_add_tail(&parent->sub_items, &item->entry); + *result = item; + return S_OK; }

1 0