March 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Pass a texture and sub-resource index to wined3d_device_create_cursor_texture ().
by Alexandre Julliard March 8, 2016

March 8, 2016

Module: wine Branch: master Commit: ead77caae3568345e998139f575a7aab621cef84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead77caae3568345e998139f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 17:05:51 2016 +0100 wined3d: Pass a texture and sub-resource index to wined3d_device_create_cursor_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f9b47a2..fbbbc2c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4228,7 +4228,7 @@ void CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, } static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, - struct wined3d_surface *cursor_image) + struct wined3d_texture *cursor_image, unsigned int sub_resource_idx) { struct wined3d_sub_resource_data data; struct wined3d_resource_desc desc; @@ -4236,9 +4236,9 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined struct wined3d_texture *texture; HRESULT hr; - if (FAILED(wined3d_surface_map(cursor_image, &map_desc, NULL, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_resource_map(&cursor_image->resource, sub_resource_idx, &map_desc, NULL, WINED3D_MAP_READONLY))) { - ERR("Failed to map source surface.\n"); + ERR("Failed to map source texture.\n"); return NULL; } @@ -4252,14 +4252,14 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.multisample_quality = 0; desc.usage = WINED3DUSAGE_DYNAMIC; desc.pool = WINED3D_POOL_DEFAULT; - desc.width = cursor_image->resource.width; - desc.height = cursor_image->resource.height; + desc.width = cursor_image->sub_resources[sub_resource_idx].resource->width; + desc.height = cursor_image->sub_resources[sub_resource_idx].resource->height; desc.depth = 1; desc.size = 0; hr = wined3d_texture_create(device, &desc, 1, WINED3D_TEXTURE_CREATE_MAPPABLE, &data, NULL, &wined3d_null_parent_ops, &texture); - wined3d_surface_unmap(cursor_image); + wined3d_resource_unmap(&cursor_image->resource, sub_resource_idx); if (FAILED(hr)) { ERR("Failed to create cursor texture.\n"); @@ -4320,7 +4320,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device * release it after setting the cursor image. Windows doesn't * addref the set surface, so we can't do this either without * creating circular refcount dependencies. */ - if (!(device->cursor_texture = wined3d_device_create_cursor_texture(device, cursor_image))) + if (!(device->cursor_texture = wined3d_device_create_cursor_texture(device, texture, sub_resource_idx))) { ERR("Failed to create cursor texture.\n"); return WINED3DERR_INVALIDCALL;

1 0

Józef Kucia : d3d10core/tests: Add test for creating DSV with DXGI_FORMAT_UNKNOWN.
by Alexandre Julliard March 8, 2016

March 8, 2016

Module: wine Branch: master Commit: 07ce50d8643720fe95550a27e82386cc6497dbc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ce50d8643720fe95550a27e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 7 13:57:09 2016 +0100 d3d10core/tests: Add test for creating DSV with DXGI_FORMAT_UNKNOWN. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 2df0b38..a2a0e38 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -867,6 +867,20 @@ static void test_create_depthstencil_view(void) ok(U(dsv_desc).Texture2D.MipSlice == 0, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); ID3D10DepthStencilView_Release(dsview); + + dsv_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, &dsv_desc, &dsview); + ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + + memset(&dsv_desc, 0, sizeof(dsv_desc)); + ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); + todo_wine ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); + ok(dsv_desc.ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); + ok(!U(dsv_desc).Texture2D.MipSlice, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + + ID3D10DepthStencilView_Release(dsview); + ID3D10Texture2D_Release(texture); refcount = ID3D10Device_Release(device);

1 0

Józef Kucia : d3d10_1/tests: Port test_create_device( ) from d3d11.
by Alexandre Julliard March 8, 2016

March 8, 2016

Module: wine Branch: master Commit: 5d7c50dc3c8e74bf0986e05ed498b3ce44eedb98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7c50dc3c8e74bf0986e05ed… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 7 13:57:06 2016 +0100 d3d10_1/tests: Port test_create_device() from d3d11. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/Makefile.in | 2 +- dlls/d3d10_1/tests/d3d10_1.c | 175 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d7c50dc3c8e74bf0986e…

1 0

Alistair Leslie-Hughes : d3d10_1: Implement D3D10CreateDeviceAndSwapChain1 ().
by Alexandre Julliard March 8, 2016

March 8, 2016

Module: wine Branch: master Commit: 93a48fb40e18c8741bcf938fe977f5271a588a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a48fb40e18c8741bcf938fe… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 7 13:57:05 2016 +0100 d3d10_1: Implement D3D10CreateDeviceAndSwapChain1(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/d3d10_1.spec | 2 +- dlls/d3d10_1/d3d10_1_main.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ include/d3d10_1.idl | 4 +++ 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10_1/d3d10_1.spec b/dlls/d3d10_1/d3d10_1.spec index b3d2da7..5582558 100644 --- a/dlls/d3d10_1/d3d10_1.spec +++ b/dlls/d3d10_1/d3d10_1.spec @@ -3,7 +3,7 @@ @ stub D3D10CompileShader @ stub D3D10CreateBlob @ stdcall D3D10CreateDevice1(ptr long ptr long long long ptr) -@ stub D3D10CreateDeviceAndSwapChain1 +@ stdcall D3D10CreateDeviceAndSwapChain1(ptr long ptr long long long ptr ptr ptr) @ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) d3d10.D3D10CreateEffectFromMemory @ stub D3D10CreateEffectPoolFromMemory @ stdcall D3D10CreateStateBlock(ptr ptr ptr) d3d10.D3D10CreateStateBlock diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index d0ca213..1f35c43 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -176,3 +176,72 @@ HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; } + +HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 feature_level, UINT sdk_version, + DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D10Device1 **device) +{ + IDXGIDevice *dxgi_device; + IDXGIFactory *factory; + HRESULT hr; + + TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, " + "feature_level %s, sdk_version %d, swapchain_desc %p, swapchain %p, device %p.\n", + adapter, debug_d3d10_driver_type(driver_type), swrast, flags, + debug_d3d10_feature_level(feature_level), sdk_version, swapchain_desc, swapchain, device); + + if (swapchain) + *swapchain = NULL; + + if (!device) + return E_INVALIDARG; + + if (FAILED(hr = D3D10CreateDevice1(adapter, driver_type, swrast, flags, feature_level, sdk_version, device))) + { + WARN("Failed to create a device, returning %#x.\n", hr); + *device = NULL; + return hr; + } + + if (swapchain) + { + if (FAILED(hr = ID3D10Device1_QueryInterface(*device, &IID_IDXGIDevice, (void **)&dxgi_device))) + { + ERR("Failed to get a dxgi device from the d3d10 device, returning %#x.\n", hr); + goto cleanup; + } + + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + IDXGIDevice_Release(dxgi_device); + if (FAILED(hr)) + { + ERR("Failed to get the device adapter, returning %#x.\n", hr); + goto cleanup; + } + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + IDXGIAdapter_Release(adapter); + if (FAILED(hr)) + { + ERR("Failed to get the adapter factory, returning %#x.\n", hr); + goto cleanup; + } + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)*device, swapchain_desc, swapchain); + IDXGIFactory_Release(factory); + if (FAILED(hr)) + { + WARN("Failed to create a swapchain, returning %#x.\n", hr); + goto cleanup; + } + + TRACE("Created IDXGISwapChain %p.\n", *swapchain); + } + + return S_OK; + +cleanup: + ID3D10Device1_Release(*device); + *device = NULL; + return hr; +} diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl index 4ee49c6..a37ff9e 100644 --- a/include/d3d10_1.idl +++ b/include/d3d10_1.idl @@ -151,3 +151,7 @@ const UINT D3D10_1_SDK_VERSION = 0x20; cpp_quote("HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter*,D3D10_DRIVER_TYPE,") cpp_quote(" HMODULE,UINT,D3D10_FEATURE_LEVEL1,UINT,ID3D10Device1**);") + +[local] HRESULT __stdcall D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, enum D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 feature_level, UINT sdk_version, + DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D10Device1 **device);

1 0

André Hentschel : Fix German Wine introduction
by Jeremy Newman March 7, 2016

March 7, 2016

Module: website Branch: master Commit: f2fe7652ac1d9a6088fd5e25477ea444bd621286 URL: http://source.winehq.org/git/website.git/?a=commit;h=f2fe7652ac1d9a6088fd5e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 7 20:53:56 2016 +0100 Fix German Wine introduction Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/about.template | 2 +- templates/de/home.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index 939b10c..be369dc 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -3,7 +3,7 @@ <h1 class="title">Über Wine</h1> -<p>Wine ermöglicht es, Windows-Programme unter anderen Betriebssystemen laufen lassen. Mit Wine kannst Du diese Programme genauso installieren und laufen lassen, wie unter Windows.</p> +<p>Wine ermöglicht es, Windows-Programme unter anderen Betriebssystemen laufen zu lassen. Mit Wine kannst Du diese Programme genauso installieren und laufen lassen, wie unter Windows.</p> <p>Wine wird aktiv weiterentwickelt. Noch läuft nicht jedes Programm, aber <a href="https://wiki.winehq.org/UsageStatistics" title="Statistik zur Wine-Benutzung">mehrere Millionen Anwender (en)</a> nutzen Wine, um ihre Programme zu verwenden.</p> diff --git a/templates/de/home.template b/templates/de/home.template index bcc9b46..e8e79ba 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -40,7 +40,7 @@ <div class="clear"></div> </div> - <p>Wine ermöglicht es, Windows-Programme unter anderen Betriebssystemen laufen lassen. Mit Wine kannst Du diese Programme genauso installieren und laufen lassen, wie unter Windows.</p> + <p>Wine ermöglicht es, Windows-Programme unter anderen Betriebssystemen laufen zu lassen. Mit Wine kannst Du diese Programme genauso installieren und laufen lassen, wie unter Windows.</p> </div>

1 0

Frédéric Delanoy : French translation for release 1.9.5
by Jeremy Newman March 7, 2016

March 7, 2016

Module: website Branch: master Commit: 6db89d734c5d4866dc36f3795f112685598d3b86 URL: http://source.winehq.org/git/website.git/?a=commit;h=6db89d734c5d4866dc36f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Mar 5 22:22:58 2016 +0100 French translation for release 1.9.5 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016030501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2016030501.xml b/news/fr/2016030501.xml new file mode 100644 index 0000000..f6cdfb2 --- /dev/null +++ b/news/fr/2016030501.xml @@ -0,0 +1,15 @@ +<news> +<date>5 mars 2016</date> +<title>Sortie de Wine 1.9.5</title> +<body> +<p>La version de développement 1.9.5 de Wine est disponible.</p> +<p><a href="{$root}/announce/1.9.5">Nouveautés</a> de cette version : +<ul> + <li>Nouvelle version du moteur Mono, avec prise en charge du mode 64 bits.</li> + <li>Ébauche du flux de commandes WineD3D.</li> + <li>Prise en charge des états d'effets dans Direct3DX.</li> + <li>Améliorations dans le glisser-déposer.</li> + <li>Diverses corrections de bugs.</li> +</ul></p> +<p>Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.5.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Nikolay Sivov : dwrite: Use correct return code on allocation failure.
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: 27ca16c7c941e25443dd162935423b694785ed34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ca16c7c941e25443dd16293… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 7 17:09:55 2016 +0300 dwrite: Use correct return code on allocation failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 4e6bec7..e081e11 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -894,7 +894,7 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory2 *iface, cached = heap_alloc(sizeof(*cached)); if (!cached) { IDWriteFontFace3_Release(face); - return hr; + return E_OUTOFMEMORY; } cached->fontface = (IDWriteFontFace*)face;

1 0

Alexandre Julliard : configure: Don' t create makefiles in directories that are symlinks in a Wow64 build.
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: c6d6dcee47eb97fd75e389434d4136de2f31414c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d6dcee47eb97fd75e389434… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 16:26:42 2016 +0900 configure: Don't create makefiles in directories that are symlinks in a Wow64 build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 4 ++++ configure | 9 ++++++--- configure.ac | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 00eeb98..41eb7f6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -299,6 +299,10 @@ wine_fn_config_makefile () ac_enable=$[2] ac_flags=$[3] + case $ac_dir in + dnl These are created as symlinks for wow64 builds + fonts|server) test -z "$with_wine64" || return ;; + esac AS_VAR_IF([$ac_enable],[no],[wine_fn_disabled_rules; return]) wine_fn_all_rules wine_fn_install_rules diff --git a/configure b/configure index 14b4082..bee8e6b 100755 --- a/configure +++ b/configure @@ -7511,6 +7511,9 @@ wine_fn_config_makefile () ac_enable=$2 ac_flags=$3 + case $ac_dir in + fonts|server) test -z "$with_wine64" || return ;; + esac if eval test \"x\$"$ac_enable"\" = x"no"; then : wine_fn_disabled_rules; return fi @@ -18263,15 +18266,15 @@ fi if test -n "$with_wine64" then - wine_fn_append_rule "all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader -fonts server tools: + wine_fn_append_rule "all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader +fonts server: \$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@ $with_wine64/loader/wine: \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@ $with_wine64/loader/wine-preloader: \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@ clean:: - \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" + \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else WINELOADER_INSTALL="wine.inf" diff --git a/configure.ac b/configure.ac index b57ff6a..09e0f53 100644 --- a/configure.ac +++ b/configure.ac @@ -3596,15 +3596,15 @@ fi if test -n "$with_wine64" then WINE_APPEND_RULE( -[all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader -fonts server tools: +[all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader +fonts server: \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@] $with_wine64/loader/wine: \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@] $with_wine64/loader/wine-preloader: \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] clean:: - \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) + \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else AC_SUBST(WINELOADER_INSTALL,"wine.inf") WINE_APPEND_RULE(

1 0

Nikolay Sivov : dwrite: Update to IDWriteFont3.
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: fa6c255f8de4b28e6bdeadca8d27d226ddff48d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6c255f8de4b28e6bdeadca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 7 17:10:17 2016 +0300 dwrite: Update to IDWriteFont3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 132 ++++++++++++++++++++++++++++++----------------- dlls/dwrite/tests/font.c | 38 ++++++++++++-- include/dwrite_3.idl | 9 ++++ 3 files changed, 130 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa6c255f8de4b28e6bdea…

1 0

Louis Lenders : ntdll: Add stub for RtlAddAccessDeniedObjectAce and forward to AddAccessDeniedObjectAce in advapi32.
by Alexandre Julliard March 7, 2016

March 7, 2016

Module: wine Branch: master Commit: eee837e9314e8bb3eb2f8d27f280560996bf7714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee837e9314e8bb3eb2f8d27f… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Mar 4 08:40:39 2016 +0100 ntdll: Add stub for RtlAddAccessDeniedObjectAce and forward to AddAccessDeniedObjectAce in advapi32. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 16 ++++++++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 17 +++++++++++++++++ include/winternl.h | 1 + 8 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index bab9997..c38e92e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -19,7 +19,7 @@ @ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) @ stdcall AddAccessDeniedAce(ptr long long ptr) @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) -# @ stub AddAccessDeniedObjectAce +@ stdcall AddAccessDeniedObjectAce(ptr long long long ptr ptr ptr) @ stdcall AddAce(ptr long long ptr long) @ stdcall AddAuditAccessAce(ptr long long ptr long long) @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index b74b1a1..c8a6579 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1683,6 +1683,22 @@ BOOL WINAPI AddAccessDeniedAceEx( } /****************************************************************************** + * AddAccessDeniedObjectAce [ADVAPI32.@] + */ +BOOL WINAPI AddAccessDeniedObjectAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwAccessMask, + IN GUID* pObjectTypeGuid, + IN GUID* pInheritedObjectTypeGuid, + IN PSID pSid) +{ + return set_ntstatus( RtlAddAccessDeniedObjectAce(pAcl, dwAceRevision, dwAceFlags, dwAccessMask, + pObjectTypeGuid, pInheritedObjectTypeGuid, pSid) ); +} + +/****************************************************************************** * AddAce [ADVAPI32.@] */ BOOL WINAPI AddAce( diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 5bb0e55..80bc0ed 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -10,7 +10,7 @@ @ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessAllowedObjectAce @ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx -@ stub AddAccessDeniedObjectAce +@ stdcall AddAccessDeniedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessDeniedObjectAce @ stdcall AddAce(ptr long long ptr long) advapi32.AddAce @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index 1cc6206..083c921 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -10,7 +10,7 @@ @ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessAllowedObjectAce @ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx -@ stub AddAccessDeniedObjectAce +@ stdcall AddAccessDeniedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessDeniedObjectAce @ stdcall AddAce(ptr long long ptr long) advapi32.AddAce @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index 83ecd50..fc3e5f4 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -10,7 +10,7 @@ @ stdcall AddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessAllowedObjectAce @ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx -@ stub AddAccessDeniedObjectAce +@ stdcall AddAccessDeniedObjectAce(ptr long long long ptr ptr ptr) advapi32.AddAccessDeniedObjectAce @ stdcall AddAce(ptr long long ptr long) advapi32.AddAce @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index bbada48..0a68144 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -410,7 +410,7 @@ @ stdcall RtlAddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) @ stdcall RtlAddAccessDeniedAce(ptr long long ptr) @ stdcall RtlAddAccessDeniedAceEx(ptr long long long ptr) -# @ stub RtlAddAccessDeniedObjectAce +@ stdcall RtlAddAccessDeniedObjectAce(ptr long long long ptr ptr ptr) @ stdcall RtlAddAce(ptr long long ptr long) @ stub RtlAddActionToRXact @ stdcall RtlAddAtomToAtomTable(ptr wstr ptr) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index d4739d5..3bc52ac 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1304,6 +1304,23 @@ NTSTATUS WINAPI RtlAddAccessDeniedAceEx( AccessMask, pSid, ACCESS_DENIED_ACE_TYPE); } +/****************************************************************************** + * RtlAddAccessDeniedObjectAce [NTDLL.@] + */ +NTSTATUS WINAPI RtlAddAccessDeniedObjectAce( + IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD dwAceFlags, + IN DWORD dwAccessMask, + IN GUID* pObjectTypeGuid, + IN GUID* pInheritedObjectTypeGuid, + IN PSID pSid) +{ + FIXME("%p %x %x %x %p %p %p - stub\n", pAcl, dwAceRevision, dwAceFlags, dwAccessMask, + pObjectTypeGuid, pInheritedObjectTypeGuid, pSid); + return STATUS_NOT_IMPLEMENTED; +} + /************************************************************************** * RtlAddAuditAccessAce [NTDLL.@] */ diff --git a/include/winternl.h b/include/winternl.h index 303f890..dddf946 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2355,6 +2355,7 @@ NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessAllowedObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedAce(PACL,DWORD,DWORD,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID); +NTSYSAPI NTSTATUS WINAPI RtlAddAccessDeniedObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID); NTSYSAPI NTSTATUS WINAPI RtlAddAtomToAtomTable(RTL_ATOM_TABLE,const WCHAR*,RTL_ATOM*); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL);

1 0