wine-commits September 2015

wine-commits@winehq.org

2 participants
318 discussions

Józef Kucia : dxgi/tests: Remove leftover debug comment.
by Alexandre Julliard 14 Sep '15

14 Sep '15

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 14 Sep '15

14 Sep '15

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 : dxgi/tests: Check that DXGI surface implements ID3D11Texture2D.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: cee4d0bb9151fc5361d36e36094c7d08c577af7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee4d0bb9151fc5361d36e360… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:38 2015 +0200 dxgi/tests: Check that DXGI surface implements ID3D11Texture2D. --- dlls/dxgi/tests/device.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index d6db790..fe2c453 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -172,10 +172,10 @@ done: static void test_create_surface(void) { - ID3D10Texture2D *texture; - IDXGISurface *surface; DXGI_SURFACE_DESC desc; + IDXGISurface *surface; IDXGIDevice *device; + IUnknown *texture; ULONG refcount; HRESULT hr; @@ -196,7 +196,12 @@ static void test_create_surface(void) hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); ok(SUCCEEDED(hr), "Surface should implement ID3D10Texture2D\n"); - if (SUCCEEDED(hr)) ID3D10Texture2D_Release(texture); + IUnknown_Release(texture); + + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Surface should implement ID3D11Texture2D.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(texture); IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device);

1 0

Józef Kucia : d3d11/tests: Port test_create_depthstencil_view() from d3d10core.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: e0bd44583ccb3493f395f98e4a7a72d9114bc825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0bd44583ccb3493f395f98e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:34 2015 +0200 d3d11/tests: Port test_create_depthstencil_view() from d3d10core. --- dlls/d3d11/tests/d3d11.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8bf31dc..44e1550 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -815,6 +815,64 @@ static void test_buffer_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_depthstencil_view(void) +{ + D3D11_DEPTH_STENCIL_VIEW_DESC dsv_desc; + D3D11_TEXTURE2D_DESC texture_desc; + ULONG refcount, expected_refcount; + ID3D11DepthStencilView *dsview; + ID3D11Device *device, *tmp; + ID3D11Texture2D *texture; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsview); + ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11DepthStencilView_GetDevice(dsview, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); + ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); + ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); + ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); + ok(U(dsv_desc).Texture2D.MipSlice == 0, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + + ID3D11DepthStencilView_Release(dsview); + ID3D11Texture2D_Release(texture); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_depthstencil_view_interfaces(void) { D3D10_DEPTH_STENCIL_VIEW_DESC d3d10_dsv_desc; @@ -1094,6 +1152,7 @@ START_TEST(d3d11) test_create_texture3d(); test_texture3d_interfaces(); test_buffer_interfaces(); + test_create_depthstencil_view(); test_depthstencil_view_interfaces(); test_create_rendertarget_view(); test_create_shader_resource_view();

1 0

Józef Kucia : d3d10core/tests: Check that shader resource view implements ID3D11ShaderResourceView.
by Alexandre Julliard 14 Sep '15

14 Sep '15

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: Port test_depthstencil_view_interfaces() from d3d11.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: fbf7b84d10175798cac19fe9e5f980593671f163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf7b84d10175798cac19fe9e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:31 2015 +0200 d3d10core/tests: Port test_depthstencil_view_interfaces() from d3d11. --- dlls/d3d10core/tests/device.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ebe50cc..e24cc94 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -704,6 +704,74 @@ static void test_create_depthstencil_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_depthstencil_view_interfaces(void) +{ + D3D11_DEPTH_STENCIL_VIEW_DESC d3d11_dsv_desc; + D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; + ID3D11DepthStencilView *d3d11_dsview; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10DepthStencilView *dsview; + ID3D10Texture2D *texture; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + dsv_desc.Format = texture_desc.Format; + dsv_desc.ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2D; + U(dsv_desc).Texture2D.MipSlice = 0; + + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, &dsv_desc, &dsview); + ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + + hr = ID3D10DepthStencilView_QueryInterface(dsview, &IID_ID3D11DepthStencilView, (void **)&d3d11_dsview); + ID3D10DepthStencilView_Release(dsview); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Depth stencil view should implement ID3D11DepthStencilView.\n"); + + if (SUCCEEDED(hr)) + { + ID3D11DepthStencilView_GetDesc(d3d11_dsview, &d3d11_dsv_desc); + ok(d3d11_dsv_desc.Format == dsv_desc.Format, "Got unexpected format %#x.\n", d3d11_dsv_desc.Format); + ok(d3d11_dsv_desc.ViewDimension == (D3D11_DSV_DIMENSION)dsv_desc.ViewDimension, + "Got unexpected view dimension %u.\n", d3d11_dsv_desc.ViewDimension); + ok(!d3d11_dsv_desc.Flags, "Got unexpected flags %#x.\n", d3d11_dsv_desc.Flags); + ok(U(d3d11_dsv_desc).Texture2D.MipSlice == U(dsv_desc).Texture2D.MipSlice, + "Got unexpected mip slice %u.\n", U(d3d11_dsv_desc).Texture2D.MipSlice); + + ID3D11DepthStencilView_Release(d3d11_dsview); + } + else + { + win_skip("D3D11 is not available.\n"); + } + + ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_rendertarget_view(void) { D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -3738,6 +3806,7 @@ START_TEST(device) test_create_texture3d(); test_buffer_interfaces(); test_create_depthstencil_view(); + test_depthstencil_view_interfaces(); test_create_rendertarget_view(); test_create_shader_resource_view(); test_create_shader();

1 0

Józef Kucia : d3d10core/tests: Check that render target view implements ID3D11RenderTargetView.
by Alexandre Julliard 14 Sep '15

14 Sep '15

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

Florian Pelz : po: German translation: Various fixes.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: a161fb318b3b0ab58f2bf199bc72752c2390cbbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a161fb318b3b0ab58f2bf199b… Author: Florian Pelz <pelzflorian(a)pelzflorian.de> Date: Sun Sep 13 17:51:11 2015 +0200 po: German translation: Various fixes. Mostly as suggested by Julian Rüger. With suggestion from Jens Reyer. --- po/de.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/po/de.po b/po/de.po index 3dc3bff..ef20da1 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-09-02 12:17+0200\n" +"PO-Revision-Date: 2015-09-13 17:46+0200\n" "Last-Translator: Florian Pelz\n" "Language-Team: German\n" "Language: de\n" @@ -1515,7 +1515,7 @@ msgstr "CMC-Antwort" #: crypt32.rc:105 msgid "Unsigned CMC Request" -msgstr "Unsignierte-CMC-Antwort" +msgstr "Unsignierte CMC-Anfrage" #: crypt32.rc:106 msgid "CMC Status Info" @@ -1695,15 +1695,15 @@ msgstr "Windows-Hardware-Treiber-Verifizierung" #: crypt32.rc:150 cryptui.rc:134 msgid "Windows System Component Verification" -msgstr "Windows-System-Komponenten-Verifizierung" +msgstr "Windows-Systemkomponenten-Verifizierung" #: crypt32.rc:151 cryptui.rc:135 msgid "OEM Windows System Component Verification" -msgstr "OEM-Windows-System-Komponenten-Verifizierung" +msgstr "OEM-Windows-Systemkomponenten-Verifizierung" #: crypt32.rc:152 cryptui.rc:136 msgid "Embedded Windows System Component Verification" -msgstr "Embedded-Windows-System-Komponenten-Verifizierung" +msgstr "Embedded-Windows-Systemkomponenten-Verifizierung" #: crypt32.rc:153 cryptui.rc:143 msgid "Key Pack Licenses" @@ -1735,7 +1735,7 @@ msgstr "Dokumentensignatur" #: crypt32.rc:160 msgid "IP security IKE intermediate" -msgstr "Dazwischenliegende IP-Sicherheits-IKE" +msgstr "Intermediäre IP-Sicherheits-IKE" #: crypt32.rc:161 cryptui.rc:132 msgid "File Recovery" @@ -1775,7 +1775,7 @@ msgstr "Persönlich" #: crypt32.rc:174 msgid "Intermediate Certification Authorities" -msgstr "Zwischenzertifizierungsstellen" +msgstr "Intermediäre Zertifizierungsstellen" #: crypt32.rc:175 msgid "Other People" @@ -6843,9 +6843,9 @@ msgstr "" "Protokollierung und Benutzeroberfläche für die oberen Befehle anpassen:\n" "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] Protokolldatei\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" -"MSI-Service registrieren:\n" +"MSI-Dienst registrieren:\n" "\t/y\n" -"Registrierung des MSI-Service aufheben:\n" +"Registrierung des MSI-Dienstes aufheben:\n" "\t/z\n" "Diese Hilfe anzeigen:\n" "\t/help\n" @@ -6921,7 +6921,7 @@ msgstr "Vollständige Frames (Unkomprimiert)" #: msvidc32.rc:29 msgid "Wine Video 1 video codec" -msgstr "Wine-Video-1-Video-Codec" +msgstr "Wine-Video-1-Videocodec" #: oleacc.rc:31 msgid "unknown object" @@ -10533,7 +10533,7 @@ msgstr "DHCP aktiviert" #: ipconfig.rc:49 msgid "Default gateway" -msgstr "Standard-Gateway" +msgstr "Standardgateway" #: ipconfig.rc:50 msgid "IPv6 address" @@ -12919,7 +12919,7 @@ msgstr "Die Prozessoraffinität konnte nicht geändert werden" #: taskmgr.rc:322 msgid "System Idle Process" -msgstr "Leerlauf-Prozess" +msgstr "Leerlaufprozess" #: taskmgr.rc:323 msgid "Not Responding" @@ -13060,7 +13060,7 @@ msgstr "" #: winecfg.rc:143 msgid "Windows registration information" -msgstr "Windows-Registrierungs-Informationen" +msgstr "Windows-Registrierungsinformationen" #: winecfg.rc:144 msgid "&Owner:" @@ -13790,7 +13790,7 @@ msgstr "Dies ist ein Test" #: wineconsole.rc:44 msgid "wineconsole: Couldn't parse event id\n" -msgstr "wineconsole: Ereignis-ID konnte nicht geparset werden\n" +msgstr "wineconsole: Parsen der Ereignis-ID fehlgeschlagen\n" #: wineconsole.rc:45 msgid "wineconsole: Invalid backend\n"

1 0

Aric Stewart : hidclass.sys: Implement a report ring buffer.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 7e2ca70f799c12418178ef08d95ff10445b410b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2ca70f799c12418178ef08d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Sep 11 10:45:54 2015 -0500 hidclass.sys: Implement a report ring buffer. --- dlls/hidclass.sys/Makefile.in | 1 + dlls/hidclass.sys/buffer.c | 81 +++++++++++++++++++++++++++++++++++++++++++ dlls/hidclass.sys/device.c | 2 ++ dlls/hidclass.sys/hid.h | 7 ++++ dlls/hidclass.sys/pnp.c | 2 ++ 5 files changed, 93 insertions(+) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index c5c9eb7..8ed51e6 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = ntoskrnl.exe DELAYIMPORTS = setupapi hid C_SRCS = \ + buffer.c \ device.c \ main.c \ pnp.c diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c new file mode 100644 index 0000000..6fbcc0d --- /dev/null +++ b/dlls/hidclass.sys/buffer.c @@ -0,0 +1,81 @@ +/* Implementation of a ring buffer for reports + * + * Copyright 2015 CodeWeavers, Aric Stewart + * + * 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 + */ + +#include "config.h" +#include <stdarg.h> +#define NONAMELESSUNION +#include "hid.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hid); + +#define BASE_BUFFER_SIZE 32 + +struct ReportRingBuffer +{ + UINT start, end, size; + + int *pointers; + UINT pointer_alloc; + UINT buffer_size; + + CRITICAL_SECTION lock; + + BYTE *buffer; +}; + +struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) +{ + struct ReportRingBuffer *ring; + TRACE("Create Ring Buffer with buffer size %i\n",buffer_size); + ring = HeapAlloc(GetProcessHeap(), 0, sizeof(*ring)); + if (!ring) + return NULL; + ring->start = ring->end = 0; + ring->size = BASE_BUFFER_SIZE; + ring->buffer_size = buffer_size; + ring->pointer_alloc = 2; + ring->pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(int) * ring->pointer_alloc); + if (!ring->pointers) + { + HeapFree(GetProcessHeap(), 0, ring); + return NULL; + } + memset(ring->pointers, 0xff, sizeof(int) * ring->pointer_alloc); + ring->buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size * ring->size); + if (!ring->buffer) + { + HeapFree(GetProcessHeap(), 0, ring->pointers); + HeapFree(GetProcessHeap(), 0, ring); + return NULL; + } + InitializeCriticalSection(&ring->lock); + ring->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RingBuffer.lock"); + return ring; +} + +void RingBuffer_Destroy(struct ReportRingBuffer *ring) +{ + HeapFree(GetProcessHeap(), 0, ring->buffer); + HeapFree(GetProcessHeap(), 0, ring->pointers); + ring->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&ring->lock); + HeapFree(GetProcessHeap(), 0, ring); +} diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 384bc8f..e8deb95 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -178,6 +178,8 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device CloseHandle(ext->halt_event); HeapFree(GetProcessHeap(), 0, ext->preparseData); + if (ext->ring_buffer) + RingBuffer_Destroy(ext->ring_buffer); entry = RemoveHeadList(&ext->irp_queue); while(entry != &ext->irp_queue) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index efa4712..538942b 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -35,6 +35,9 @@ typedef NTSTATUS (WINAPI *pAddDevice)(DRIVER_OBJECT *DriverObject, DEVICE_OBJECT *PhysicalDeviceObject); +/* Ring buffer functions */ +struct ReportRingBuffer; + typedef struct _BASE_DEVICE_EXTENSTION { HID_DEVICE_EXTENSION deviceExtension; @@ -44,6 +47,7 @@ typedef struct _BASE_DEVICE_EXTENSTION { ULONG poll_interval; WCHAR *device_name; WCHAR *link_name; + struct ReportRingBuffer *ring_buffer; HANDLE halt_event; HANDLE thread; @@ -52,6 +56,9 @@ typedef struct _BASE_DEVICE_EXTENSTION { /* Minidriver Specific stuff will end up here */ } BASE_DEVICE_EXTENSION; +void RingBuffer_Destroy(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; +struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) DECLSPEC_HIDDEN; + typedef struct _minidriver { struct list entry; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 0fb06a2..43bc449 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -126,6 +126,8 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ext->poll_interval = DEFAULT_POLL_INTERVAL; InitializeListHead(&ext->irp_queue); + ext->ring_buffer = RingBuffer_Create(sizeof(HID_XFER_PACKET) + ext->preparseData->caps.InputReportByteLength); + return STATUS_SUCCESS; }

1 0

Katarzyna Caban : po: Update Polish translation.
by Alexandre Julliard 14 Sep '15

14 Sep '15

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

← Newer
1
...
8
9
10
11
12
13
14
...
32
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 September 2015