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

Hans Leidekker : sspicli: Implement SspiEncodeStringsAsAuthIdentity.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 765f1b237f99c67e9f7cb563bcb158e34521d770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=765f1b237f99c67e9f7cb563b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:28:30 2016 +0200 sspicli: Implement SspiEncodeStringsAsAuthIdentity. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sspicli/Makefile.in | 3 ++ dlls/sspicli/main.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/sspicli/sspicli.spec | 2 +- 3 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/sspicli/Makefile.in b/dlls/sspicli/Makefile.in index 24e8d43..ceef844 100644 --- a/dlls/sspicli/Makefile.in +++ b/dlls/sspicli/Makefile.in @@ -1 +1,4 @@ MODULE = sspicli.dll + +C_SRCS = \ + main.c diff --git a/dlls/sspicli/main.c b/dlls/sspicli/main.c new file mode 100644 index 0000000..a5313cb --- /dev/null +++ b/dlls/sspicli/main.c @@ -0,0 +1,81 @@ +/* + * Copyright 2016 Hans Leidekker 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "rpc.h" +#include "sspi.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sspicli); + +/*********************************************************************** + * SspiEncodeStringsAsAuthIdentity (SECUR32.0) + */ +SECURITY_STATUS SEC_ENTRY SspiEncodeStringsAsAuthIdentity( + const WCHAR *username, const WCHAR *domainname, const WCHAR *creds, + PSEC_WINNT_AUTH_IDENTITY_OPAQUE *opaque_id ) +{ + SEC_WINNT_AUTH_IDENTITY_W *id; + DWORD len_username = 0, len_domainname = 0, len_password = 0, size; + WCHAR *ptr; + + FIXME( "%s %s %s %p\n", debugstr_w(username), debugstr_w(domainname), + debugstr_w(creds), opaque_id ); + + if (!username && !domainname && !creds) return SEC_E_INVALID_TOKEN; + + if (username) len_username = strlenW( username ); + if (domainname) len_domainname = strlenW( domainname ); + if (creds) len_password = strlenW( creds ); + + size = sizeof(*id); + if (username) size += (len_username + 1) * sizeof(WCHAR); + if (domainname) size += (len_domainname + 1) * sizeof(WCHAR); + if (creds) size += (len_password + 1) * sizeof(WCHAR); + if (!(id = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ))) return ERROR_OUTOFMEMORY; + ptr = (WCHAR *)(id + 1); + + if (username) + { + memcpy( ptr, username, (len_username + 1) * sizeof(WCHAR) ); + id->User = ptr; + id->UserLength = len_username; + ptr += len_username + 1; + } + if (domainname) + { + memcpy( ptr, domainname, (len_domainname + 1) * sizeof(WCHAR) ); + id->Domain = ptr; + id->DomainLength = len_domainname; + ptr += len_domainname + 1; + } + if (creds) + { + memcpy( ptr, creds, (len_password + 1) * sizeof(WCHAR) ); + id->Password = ptr; + id->PasswordLength = len_password; + } + + *opaque_id = id; + return SEC_E_OK; +} diff --git a/dlls/sspicli/sspicli.spec b/dlls/sspicli/sspicli.spec index acd8b70..7b92102 100644 --- a/dlls/sspicli/sspicli.spec +++ b/dlls/sspicli/sspicli.spec @@ -84,7 +84,7 @@ @ stub SspiDecryptAuthIdentity @ stub SspiDecryptAuthIdentityEx @ stub SspiEncodeAuthIdentityAsStrings -@ stub SspiEncodeStringsAsAuthIdentity +@ stdcall SspiEncodeStringsAsAuthIdentity(wstr wstr wstr ptr) @ stub SspiEncryptAuthIdentity @ stub SspiEncryptAuthIdentityEx @ stub SspiExcludePackage

1 0

Hans Leidekker : sspicli: New dll.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: b342ef95db98fa3fb4603d96a83c9a5f5a7da8a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b342ef95db98fa3fb4603d96a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:28:29 2016 +0200 sspicli: New dll. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/sspicli/Makefile.in | 1 + dlls/sspicli/sspicli.spec | 104 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+) diff --git a/configure b/configure index 0b1528d..944ff6b 100755 --- a/configure +++ b/configure @@ -1328,6 +1328,7 @@ enable_slc enable_snmpapi enable_softpub enable_spoolss +enable_sspicli enable_stdole2_tlb enable_stdole32_tlb enable_sti @@ -18029,6 +18030,7 @@ wine_fn_config_dll softpub enable_softpub wine_fn_config_dll sound.drv16 enable_win16 wine_fn_config_dll spoolss enable_spoolss implib wine_fn_config_test dlls/spoolss/tests spoolss_test +wine_fn_config_dll sspicli enable_sspicli wine_fn_config_dll stdole2.tlb enable_stdole2_tlb clean wine_fn_config_dll stdole32.tlb enable_stdole32_tlb clean wine_fn_config_dll sti enable_sti clean,implib diff --git a/configure.ac b/configure.ac index 595b8f1..6e960a1 100644 --- a/configure.ac +++ b/configure.ac @@ -3264,6 +3264,7 @@ WINE_CONFIG_DLL(softpub) WINE_CONFIG_DLL(sound.drv16,enable_win16) WINE_CONFIG_DLL(spoolss,,[implib]) WINE_CONFIG_TEST(dlls/spoolss/tests) +WINE_CONFIG_DLL(sspicli) WINE_CONFIG_DLL(stdole2.tlb,,[clean]) WINE_CONFIG_DLL(stdole32.tlb,,[clean]) WINE_CONFIG_DLL(sti,,[clean,implib]) diff --git a/dlls/sspicli/Makefile.in b/dlls/sspicli/Makefile.in new file mode 100644 index 0000000..24e8d43 --- /dev/null +++ b/dlls/sspicli/Makefile.in @@ -0,0 +1 @@ +MODULE = sspicli.dll diff --git a/dlls/sspicli/sspicli.spec b/dlls/sspicli/sspicli.spec new file mode 100644 index 0000000..acd8b70 --- /dev/null +++ b/dlls/sspicli/sspicli.spec @@ -0,0 +1,104 @@ +@ stub AcceptSecurityContext +@ stub AcquireCredentialsHandleA +@ stub AcquireCredentialsHandleW +@ stub AddCredentialsA +@ stub AddCredentialsW +@ stub AddSecurityPackageA +@ stub AddSecurityPackageW +@ stub ApplyControlToken +@ stub ChangeAccountPasswordA +@ stub ChangeAccountPasswordW +@ stub CompleteAuthToken +@ stub CredMarshalTargetInfo +@ stub CredUnmarshalTargetInfo +@ stub DecryptMessage +@ stub DeleteSecurityContext +@ stub DeleteSecurityPackageA +@ stub DeleteSecurityPackageW +@ stub EncryptMessage +@ stub EnumerateSecurityPackagesA +@ stub EnumerateSecurityPackagesW +@ stub ExportSecurityContext +@ stub FreeContextBuffer +@ stub FreeCredentialsHandle +@ stub GetSecurityUserInfo +@ stub GetUserNameExA +@ stub GetUserNameExW +@ stub ImpersonateSecurityContext +@ stub ImportSecurityContextA +@ stub ImportSecurityContextW +@ stub InitializeSecurityContextA +@ stub InitializeSecurityContextW +@ stub InitSecurityInterfaceA +@ stub InitSecurityInterfaceW +@ stub LogonUserExExW +@ stub LsaCallAuthenticationPackage +@ stub LsaConnectUntrusted +@ stub LsaDeregisterLogonProcess +@ stub LsaEnumerateLogonSessions +@ stub LsaFreeReturnBuffer +@ stub LsaGetLogonSessionData +@ stub LsaLogonUser +@ stub LsaLookupAuthenticationPackage +@ stub LsaRegisterLogonProcess +@ stub LsaRegisterPolicyChangeNotification +@ stub LsaUnregisterPolicyChangeNotification +@ stub MakeSignature +@ stub QueryContextAttributesA +@ stub QueryContextAttributesExA +@ stub QueryContextAttributesExW +@ stub QueryContextAttributesW +@ stub QueryCredentialsAttributesA +@ stub QueryCredentialsAttributesExA +@ stub QueryCredentialsAttributesExW +@ stub QueryCredentialsAttributesW +@ stub QuerySecurityContextToken +@ stub QuerySecurityPackageInfoA +@ stub QuerySecurityPackageInfoW +@ stub RevertSecurityContext +@ stub SaslAcceptSecurityContext +@ stub SaslEnumerateProfilesA +@ stub SaslEnumerateProfilesW +@ stub SaslGetContextOption +@ stub SaslGetProfilePackageA +@ stub SaslGetProfilePackageW +@ stub SaslIdentifyPackageA +@ stub SaslIdentifyPackageW +@ stub SaslInitializeSecurityContextA +@ stub SaslInitializeSecurityContextW +@ stub SaslSetContextOption +@ stub SealMessage +@ stub SecCacheSspiPackages +@ stub SecDeleteUserModeContext +@ stub SeciAllocateAndSetCallFlags +@ stub SeciAllocateAndSetIPAddress +@ stub SeciFreeCallContext +@ stub SeciIsProtectedUser +@ stub SecInitUserModeContext +@ stub SetContextAttributesA +@ stub SetContextAttributesW +@ stub SetCredentialsAttributesA +@ stub SetCredentialsAttributesW +@ stub SspiCompareAuthIdentities +@ stub SspiCopyAuthIdentity +@ stub SspiDecryptAuthIdentity +@ stub SspiDecryptAuthIdentityEx +@ stub SspiEncodeAuthIdentityAsStrings +@ stub SspiEncodeStringsAsAuthIdentity +@ stub SspiEncryptAuthIdentity +@ stub SspiEncryptAuthIdentityEx +@ stub SspiExcludePackage +@ stub SspiFreeAuthIdentity +@ stub SspiGetComputerNameForSPN +@ stub SspiGetTargetHostName +@ stub SspiIsAuthIdentityEncrypted +@ stub SspiLocalFree +@ stub SspiMarshalAuthIdentity +@ stub SspiPrepareForCredRead +@ stub SspiPrepareForCredWrite +@ stub SspiUnmarshalAuthIdentity +@ stub SspiUnmarshalAuthIdentityInternal +@ stub SspiValidateAuthIdentity +@ stub SspiZeroAuthIdentity +@ stub UnsealMessage +@ stub VerifySignature

1 0

Hans Leidekker : webservices: Use a long double variable in format_double.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: d3cc9d1ca69c2233dde113f379e2bf8e0a9fab82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3cc9d1ca69c2233dde113f37… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 11 09:46:16 2016 +0200 webservices: Use a long double variable in format_double. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/webservices/writer.c | 21 ++++++++++++++------- include/config.h.in | 3 +++ 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 01321fa..0b1528d 100755 --- a/configure +++ b/configure @@ -16939,6 +16939,7 @@ for ac_func in \ lrintf \ lround \ lroundf \ + powl \ remainder \ remainderf \ rint \ diff --git a/configure.ac b/configure.ac index e7c1dd1..595b8f1 100644 --- a/configure.ac +++ b/configure.ac @@ -2535,6 +2535,7 @@ AC_CHECK_FUNCS(\ lrintf \ lround \ lroundf \ + powl \ remainder \ remainderf \ rint \ diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index b1afcb8..452ee46 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdarg.h> #include <stdio.h> #include <math.h> @@ -1049,9 +1050,10 @@ static ULONG format_uint64( const UINT64 *ptr, unsigned char *buf ) static ULONG format_double( const double *ptr, unsigned char *buf ) { - static const double precision = 0.0000000000000001; +#ifdef HAVE_POWL + static const long double precision = 0.0000000000000001; unsigned char *p = buf; - double val = *ptr; /* FIXME: use long double */ + long double val = *ptr; int neg, mag, mag2, use_exp; if (isnan( val )) @@ -1081,12 +1083,12 @@ static ULONG format_double( const double *ptr, unsigned char *buf ) val = -val; } - mag = log10( val ); + mag = log10l( val ); use_exp = (mag >= 15 || (neg && mag >= 1) || mag <= -1); if (use_exp) { if (mag < 0) mag -= 1; - val = val / pow( 10.0, mag ); + val = val / powl( 10.0, mag ); mag2 = mag; mag = 0; } @@ -1094,14 +1096,14 @@ static ULONG format_double( const double *ptr, unsigned char *buf ) while (val > precision || mag >= 0) { - double weight = pow( 10.0, mag ); + long double weight = powl( 10.0, mag ); if (weight > 0 && !isinf( weight )) { - int digit = floor( val / weight ); + int digit = floorl( val / weight ); val -= digit * weight; *(p++) = '0' + digit; } - if (!mag && val > 0) *(p++) = '.'; + if (!mag && val > precision) *(p++) = '.'; mag--; } @@ -1131,6 +1133,10 @@ static ULONG format_double( const double *ptr, unsigned char *buf ) } return p - buf; +#else + FIXME( "powl not found at build time\n" ); + return 0; +#endif } static ULONG format_guid( const GUID *ptr, unsigned char *buf ) @@ -1212,6 +1218,7 @@ static HRESULT text_to_utf8text( const WS_XML_TEXT *text, WS_XML_UTF8_TEXT **ret if (!set_fp_rounding( &fpword )) return E_NOTIMPL; len = format_double( &double_text->value, buf ); restore_fp_rounding( fpword ); + if (!len) return E_NOTIMPL; if (!(*ret = alloc_utf8_text( buf, len ))) return E_OUTOFMEMORY; return S_OK; } diff --git a/include/config.h.in b/include/config.h.in index 6fd84bf..a4a4bb4 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -672,6 +672,9 @@ /* Define to 1 if you have the <port.h> header file. */ #undef HAVE_PORT_H +/* Define to 1 if you have the `powl' function. */ +#undef HAVE_POWL + /* Define if we can use ppdev.h for parallel port access */ #undef HAVE_PPDEV

1 0

Józef Kucia : wined3d: Use uintBitsToFloat() for float immediate shader constants.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: a44cdbfdd256dcdb0e87d51b723dbd566d91b1f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44cdbfdd256dcdb0e87d51b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 13 10:52:02 2016 +0200 wined3d: Use uintBitsToFloat() for float immediate shader constants. This fixes issues with special floating-point values in immediate constants. Inspired by a patch by Guillaume Charifi. 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/wined3d/glsl_shader.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2c04260..0090308 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2548,7 +2548,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->data_type) { case WINED3D_DATA_FLOAT: - wined3d_ftoa(*(const float *)reg->immconst_data, register_name); + if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + sprintf(register_name, "uintBitsToFloat(%#xu)", reg->immconst_data[0]); + else + wined3d_ftoa(*(const float *)reg->immconst_data, register_name); break; case WINED3D_DATA_INT: sprintf(register_name, "%#x", reg->immconst_data[0]); @@ -2568,12 +2571,21 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->data_type) { case WINED3D_DATA_FLOAT: - wined3d_ftoa(*(const float *)&reg->immconst_data[0], imm_str[0]); - wined3d_ftoa(*(const float *)&reg->immconst_data[1], imm_str[1]); - wined3d_ftoa(*(const float *)&reg->immconst_data[2], imm_str[2]); - wined3d_ftoa(*(const float *)&reg->immconst_data[3], imm_str[3]); - sprintf(register_name, "vec4(%s, %s, %s, %s)", - imm_str[0], imm_str[1], imm_str[2], imm_str[3]); + if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + { + sprintf(register_name, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))", + reg->immconst_data[0], reg->immconst_data[1], + reg->immconst_data[2], reg->immconst_data[3]); + } + else + { + wined3d_ftoa(*(const float *)&reg->immconst_data[0], imm_str[0]); + wined3d_ftoa(*(const float *)&reg->immconst_data[1], imm_str[1]); + wined3d_ftoa(*(const float *)&reg->immconst_data[2], imm_str[2]); + wined3d_ftoa(*(const float *)&reg->immconst_data[3], imm_str[3]); + sprintf(register_name, "vec4(%s, %s, %s, %s)", + imm_str[0], imm_str[1], imm_str[2], imm_str[3]); + } break; case WINED3D_DATA_INT: sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)",

1 0

Józef Kucia : d3d10core/tests: Add test for immediate constant buffer.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: b7b58e85bcaa43895a8bc2c66d735f27c7ad1d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b58e85bcaa43895a8bc2c66… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 13 10:52:01 2016 +0200 d3d10core/tests: Add test for immediate constant buffer. 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 | 143 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 1071552..26e525c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -612,6 +612,49 @@ static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, check_texture_sub_resource_float_(line, texture, sub_resource_idx, expected_value, max_diff); } +#define check_texture_sub_resource_vec4(a, b, c, d) check_texture_sub_resource_vec4_(__LINE__, a, b, c, d) +static void check_texture_sub_resource_vec4_(unsigned int line, ID3D10Texture2D *texture, + unsigned int sub_resource_idx, const struct vec4 *expected_value, BYTE max_diff) +{ + struct texture_readback rb; + unsigned int x = 0, y = 0; + struct vec4 value = {0}; + BOOL all_match = TRUE; + + get_texture_readback(texture, sub_resource_idx, &rb); + for (y = 0; y < rb.height; ++y) + { + for (x = 0; x < rb.width; ++x) + { + value = *get_readback_vec4(&rb, x, y); + if (!compare_vec4(&value, expected_value, max_diff)) + { + all_match = FALSE; + break; + } + } + if (!all_match) + break; + } + release_texture_readback(&rb); + ok_(__FILE__, line)(all_match, + "Got unexpected value {%.8e, %.8e, %.8e, %.8e} at (%u, %u), sub-resource %u.\n", + value.x, value.y, value.z, value.w, x, y, sub_resource_idx); +} + +#define check_texture_vec4(a, b, c) check_texture_vec4_(__LINE__, a, b, c) +static void check_texture_vec4_(unsigned int line, ID3D10Texture2D *texture, + const struct vec4 *expected_value, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D10_TEXTURE2D_DESC texture_desc; + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture_sub_resource_vec4_(line, texture, sub_resource_idx, expected_value, max_diff); +} + static ID3D10Device *create_device(void) { ID3D10Device *device; @@ -8458,6 +8501,105 @@ static void test_null_sampler(void) release_test_context(&test_context); } +static void test_immediate_constant_buffer(void) +{ + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + unsigned int index[4] = {0}; + ID3D10Texture2D *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + ID3D10Buffer *cb; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint index; + + static const int int_array[6] = + { + 310, 111, 212, -513, -318, 0, + }; + + static const uint uint_array[6] = + { + 2, 7, 0x7f800000, 0xff800000, 0x7fc00000, 0 + }; + + static const float float_array[6] = + { + 76, 83.5f, 0.5f, 0.75f, -0.5f, 0.0f, + }; + + float4 main() : SV_Target + { + return float4(int_array[index], uint_array[index], float_array[index], 1.0f); + } +#endif + 0x43425844, 0xbad068da, 0xd631ea3c, 0x41648374, 0x3ccd0120, 0x00000001, 0x00000184, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x0000010c, 0x00000040, 0x00000043, + 0x00001835, 0x0000001a, 0x00000136, 0x00000002, 0x42980000, 0x00000000, 0x0000006f, 0x00000007, + 0x42a70000, 0x00000000, 0x000000d4, 0x7f800000, 0x3f000000, 0x00000000, 0xfffffdff, 0xff800000, + 0x3f400000, 0x00000000, 0xfffffec2, 0x7fc00000, 0xbf000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, + 0x06000036, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000056, 0x00102022, + 0x00000000, 0x0090901a, 0x0010000a, 0x00000000, 0x0600002b, 0x00102012, 0x00000000, 0x0090900a, + 0x0010000a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0090902a, 0x0010000a, 0x00000000, + 0x0100003e, + }; + static struct vec4 expected_result[] = + { + { 310.0f, 2.0f, 76.00f, 1.0f}, + { 111.0f, 7.0f, 83.50f, 1.0f}, + { 212.0f, 2139095040.0f, 0.50f, 1.0f}, + {-513.0f, 4286578688.0f, 0.75f, 1.0f}, + {-318.0f, 2143289344.0f, -0.50f, 1.0f}, + { 0.0f, 0.0f, 0.0f, 1.0f}, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(index), NULL); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + + for (i = 0; i < sizeof(expected_result) / sizeof(*expected_result); ++i) + { + *index = i; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, index, 0, 0); + + draw_quad(&test_context); + check_texture_vec4(texture, &expected_result[i], 0); + } + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps); + ID3D10Texture2D_Release(texture); + ID3D10RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -8502,4 +8644,5 @@ START_TEST(device) test_create_input_layout(); test_input_assembler(); test_null_sampler(); + test_immediate_constant_buffer(); }

1 0

Michael Stefaniuc : taskmgr: Remove some old commented out code, mostly C++.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 4c5e3205eee1653b153494951807e51fd9e59de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c5e3205eee1653b153494951… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 13 09:51:26 2016 +0200 taskmgr: Remove some old commented out code, mostly C++. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/applpage.c | 6 --- programs/taskmgr/graphctl.c | 108 -------------------------------------------- programs/taskmgr/graphctl.h | 13 ------ programs/taskmgr/perfpage.c | 24 +--------- programs/taskmgr/procpage.c | 6 --- 5 files changed, 1 insertion(+), 156 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index c7debec..e2874b5 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -49,12 +49,6 @@ static HANDLE hApplicationPageEvent = NULL; /* When this event becomes signa static BOOL bSortAscending = TRUE; static const WCHAR wszUser32[] = {'U','S','E','R','3','2','.','D','L','L',0}; -#if 0 -void SwitchToThisWindow ( -HWND hWnd, /* Handle to the window that should be activated */ -BOOL bRestore /* Restore the window if it is minimized */ -); -#endif static void ApplicationPageUpdate(void) { diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 6e83412..70051eb 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -106,21 +106,6 @@ static void GraphCtrl_Init(TGraphCtrl* this) this->m_bitmapOldPlot = NULL; } -#if 0 -TGraphCtrl::~TGraphCtrl(void) -{ - /* just to be picky restore the bitmaps for the two memory dc's */ - /* (these dc's are being destroyed so there shouldn't be any leaks) */ - if (m_bitmapOldGrid != NULL) SelectObject(m_dcGrid, m_bitmapOldGrid); - if (m_bitmapOldPlot != NULL) SelectObject(m_dcPlot, m_bitmapOldPlot); - if (m_bitmapGrid != NULL) DeleteObject(m_bitmapGrid); - if (m_bitmapPlot != NULL) DeleteObject(m_bitmapPlot); - if (m_dcGrid != NULL) DeleteDC(m_dcGrid); - if (m_dcPlot != NULL) DeleteDC(m_dcPlot); - if (m_brushBack != NULL) DeleteObject(m_brushBack); -} -#endif - static void GraphCtrl_Resize(TGraphCtrl* this) { /* NOTE: Resize automatically gets called during the setup of the control */ @@ -132,17 +117,10 @@ static void GraphCtrl_Resize(TGraphCtrl* this) /* the "left" coordinate and "width" will be modified in */ /* InvalidateCtrl to be based on the width of the y axis scaling */ -#if 0 - this->m_rectPlot.left = 20; - this->m_rectPlot.top = 10; - this->m_rectPlot.right = this->m_rectClient.right-10; - this->m_rectPlot.bottom = this->m_rectClient.bottom-25; -#else this->m_rectPlot.left = 0; this->m_rectPlot.top = -1; this->m_rectPlot.right = this->m_rectClient.right-0; this->m_rectPlot.bottom = this->m_rectClient.bottom-0; -#endif /* set some member variables to avoid multiple function calls */ this->m_nPlotHeight = this->m_rectPlot.bottom - this->m_rectPlot.top;/* m_rectPlot.Height(); */ @@ -242,61 +220,6 @@ static void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) } } -#if 0 - /* create some fonts (horizontal and vertical) */ - /* use a height of 14 pixels and 300 weight */ - /* (these may need to be adjusted depending on the display) */ - axisFont = CreateFont (14, 0, 0, 0, 300, - FALSE, FALSE, 0, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - DEFAULT_PITCH|FF_SWISS, "Arial"); - yUnitFont = CreateFont (14, 0, 900, 0, 300, - FALSE, FALSE, 0, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - DEFAULT_PITCH|FF_SWISS, "Arial"); - - /* grab the horizontal font */ - oldFont = SelectObject(m_dcGrid, axisFont); - - /* y max */ - SetTextColor(m_dcGrid, m_crGridColor); - SetTextAlign(m_dcGrid, TA_RIGHT|TA_TOP); - sprintf(strTemp, "%.*lf", m_nYDecimals, m_dUpperLimit); - TextOut(m_dcGrid, m_rectPlot.left-4, m_rectPlot.top, strTemp, _tcslen(strTemp)); - - /* y min */ - SetTextAlign(m_dcGrid, TA_RIGHT|TA_BASELINE); - sprintf(strTemp, "%.*lf", m_nYDecimals, m_dLowerLimit); - TextOut(m_dcGrid, m_rectPlot.left-4, m_rectPlot.bottom, strTemp, _tcslen(strTemp)); - - /* x min */ - SetTextAlign(m_dcGrid, TA_LEFT|TA_TOP); - TextOut(m_dcGrid, m_rectPlot.left, m_rectPlot.bottom+4, "0", 1); - - /* x max */ - SetTextAlign(m_dcGrid, TA_RIGHT|TA_TOP); - sprintf(strTemp, "%d", m_nPlotWidth/m_nShiftPixels); - TextOut(m_dcGrid, m_rectPlot.right, m_rectPlot.bottom+4, strTemp, _tcslen(strTemp)); - - /* x units */ - SetTextAlign(m_dcGrid, TA_CENTER|TA_TOP); - TextOut(m_dcGrid, (m_rectPlot.left+m_rectPlot.right)/2, - m_rectPlot.bottom+4, m_strXUnitsString, _tcslen(m_strXUnitsString)); - - /* restore the font */ - SelectObject(m_dcGrid, oldFont); - - /* y units */ - oldFont = SelectObject(m_dcGrid, yUnitFont); - SetTextAlign(m_dcGrid, TA_CENTER|TA_BASELINE); - TextOut(m_dcGrid, (m_rectClient.left+m_rectPlot.left)/2, - (m_rectPlot.bottom+m_rectPlot.top)/2, m_strYUnitsString, _tcslen(m_strYUnitsString)); - SelectObject(m_dcGrid, oldFont); -#endif /* at this point we are done filling the grid bitmap, */ /* no more drawing to this bitmap is needed until the settings are changed */ @@ -329,22 +252,6 @@ void GraphCtrl_SetRange(TGraphCtrl* this, double dLower, double dUpper, int nDec GraphCtrl_InvalidateCtrl(this); } -#if 0 -void TGraphCtrl::SetXUnits(const char* string) -{ - lstrcpynA(m_strXUnitsString, string, sizeof(m_strXUnitsString)); - /* clear out the existing garbage, re-start with a clean plot */ - InvalidateCtrl(); -} - -void TGraphCtrl::SetYUnits(const char* string) -{ - lstrcpynA(m_strYUnitsString, string, sizeof(m_strYUnitsString)); - /* clear out the existing garbage, re-start with a clean plot */ - InvalidateCtrl(); -} -#endif - void GraphCtrl_SetGridColor(TGraphCtrl* this, COLORREF color) { this->m_crGridColor = color; @@ -479,12 +386,6 @@ static void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) HBITMAP memBitmap; HBITMAP oldBitmap; /* bitmap originally found in CMemDC */ -/* RECT rcClient; */ -/* GetClientRect(hWnd, &rcClient); */ -/* FillSolidRect(dc, &rcClient, RGB(255, 0, 255)); */ -/* m_nClientWidth = rcClient.right - rcClient.left; */ -/* m_nClientHeight = rcClient.bottom - rcClient.top; */ - /* no real plotting work is performed here, */ /* just putting the existing bitmaps on the client */ @@ -509,15 +410,6 @@ static void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) DeleteDC(memDC); } -#if 0 -void TGraphCtrl::Reset(void) -{ - /* to clear the existing data (in the form of a bitmap) */ - /* simply invalidate the entire control */ - InvalidateCtrl(); -} -#endif - extern TGraphCtrl PerformancePageCpuUsageHistoryGraph; extern TGraphCtrl PerformancePageMemUsageHistoryGraph; extern HWND hPerformancePageCpuUsageHistoryGraph; diff --git a/programs/taskmgr/graphctl.h b/programs/taskmgr/graphctl.h index 2adb494..f9fb967 100644 --- a/programs/taskmgr/graphctl.h +++ b/programs/taskmgr/graphctl.h @@ -30,19 +30,6 @@ extern "C" { #endif -#if 0 - -/* Attributes */ -public: - void SetXUnits(const char* string); - void SetYUnits(const char* string); - - /* Operations */ -public: - BOOL Create(DWORD dwStyle, const RECT& rect, HWND hParentWnd, UINT nID=NULL); - -#endif - typedef struct { int m_nShiftPixels; /* amount to shift with each new point */ diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 5276de7..3969ce4 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -273,9 +273,6 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) int nXDifference; int nYDifference; -/* HDC hdc; */ -/* PAINTSTRUCT ps; */ - switch (message) { case WM_INITDIALOG: @@ -324,11 +321,6 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) GraphCtrl_Create(&PerformancePageCpuUsageHistoryGraph, hPerformancePageCpuUsageHistoryGraph, hDlg, IDC_CPU_USAGE_HISTORY_GRAPH); /* customize the control */ GraphCtrl_SetRange(&PerformancePageCpuUsageHistoryGraph, 0.0, 100.0, 10); -/* PerformancePageCpuUsageHistoryGraph.SetYUnits("Current") ; */ -/* PerformancePageCpuUsageHistoryGraph.SetXUnits("Samples (Windows Timer: 100 msec)") ; */ -/* PerformancePageCpuUsageHistoryGraph.SetBackgroundColor(RGB(0, 0, 64)) ; */ -/* PerformancePageCpuUsageHistoryGraph.SetGridColor(RGB(192, 192, 255)) ; */ -/* PerformancePageCpuUsageHistoryGraph.SetPlotColor(RGB(255, 255, 255)) ; */ GraphCtrl_SetBackgroundColor(&PerformancePageCpuUsageHistoryGraph, RGB(0, 0, 0)) ; GraphCtrl_SetGridColor(&PerformancePageCpuUsageHistoryGraph, RGB(152, 205, 152)) ; GraphCtrl_SetPlotColor(&PerformancePageCpuUsageHistoryGraph, 0, RGB(255, 0, 0)) ; @@ -356,21 +348,7 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) case WM_COMMAND: break; -#if 0 - case WM_NCPAINT: - hdc = GetDC(hDlg); - GetClientRect(hDlg, &rc); - Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT)); - ReleaseDC(hDlg, hdc); - break; - - case WM_PAINT: - hdc = BeginPaint(hDlg, &ps); - GetClientRect(hDlg, &rc); - Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT)); - EndPaint(hDlg, &ps); - break; -#endif + case WM_SIZE: do { int cx, cy; diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 1b0aacd..beccd86 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -166,12 +166,6 @@ static void ProcessPageOnNotify(LPARAM lParam) { switch (pnmh->code) { -#if 0 - case LVN_ITEMCHANGED: - ProcessPageUpdate(); - break; -#endif - case LVN_GETDISPINFOW: if (!(pnmdi->item.mask & LVIF_TEXT))

1 0

Hans Leidekker : credui: Add stub implementations of CredPackAuthenticationBufferW and CredUnpackAuthenticationBufferW.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 09686ff589814a8220bf67f1e1c214cf612a2662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09686ff589814a8220bf67f1e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:30:54 2016 +0200 credui: Add stub implementations of CredPackAuthenticationBufferW and CredUnpackAuthenticationBufferW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui.spec | 2 ++ dlls/credui/credui_main.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/credui/credui.spec b/dlls/credui/credui.spec index bb2b408..dd4bc75 100644 --- a/dlls/credui/credui.spec +++ b/dlls/credui/credui.spec @@ -1,3 +1,4 @@ +@ stdcall CredPackAuthenticationBufferW(long wstr ptr ptr ptr) @ stub CredUICmdLinePromptForCredentialsA @ stub CredUICmdLinePromptForCredentialsW @ stub CredUIConfirmCredentialsA @@ -12,6 +13,7 @@ @ stdcall CredUIReadSSOCredW(wstr ptr) @ stdcall CredUIStoreSSOCredA(str str str long) @ stdcall CredUIStoreSSOCredW(wstr wstr wstr long) +@ stdcall CredUnPackAuthenticationBufferW(long ptr long ptr ptr ptr ptr ptr ptr) @ stub DllCanUnloadNow @ stub DllGetClassObject @ stub DllRegisterServer diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index d2a098e..c63983e 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -941,3 +941,25 @@ DWORD WINAPI CredUIPromptForWindowsCredentialsW( CREDUI_INFOW *info, DWORD error out_buf, out_buf_size, save, flags ); return ERROR_CALL_NOT_IMPLEMENTED; } + +/****************************************************************************** + * CredPackAuthenticationBufferW [CREDUI.@] + */ +BOOL WINAPI CredPackAuthenticationBufferW( DWORD flags, WCHAR *username, WCHAR *password, BYTE *buf, + DWORD *size ) +{ + FIXME( "(%08x, %s, %p, %p, %p) stub\n", flags, debugstr_w(username), password, buf, size ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * CredUnPackAuthenticationBufferW [CREDUI.@] + */ +BOOL WINAPI CredUnPackAuthenticationBufferW( DWORD flags, void *buf, DWORD size, WCHAR *username, + DWORD *len_username, WCHAR *domain, DWORD *len_domain, + WCHAR *password, DWORD *len_password ) +{ + FIXME( "(%08x, %p, %u, %p, %p, %p, %p, %p, %p) stub\n", flags, buf, size, username, len_username, + domain, len_domain, password, len_password ); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Michael Stefaniuc : d3dcompiler/tests: Avoid using the LPD3DBLOB COM iface type.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: bebaec60b6fe880dc91aedb3a2708e05aeee43f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bebaec60b6fe880dc91aedb3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 10:05:13 2016 +0200 d3dcompiler/tests: Avoid using the LPD3DBLOB COM iface type. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/asm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 69dca59..6fd78c1 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -51,7 +51,7 @@ static void exec_tests(const char *name, struct shader_test tests[], unsigned in DWORD *res; unsigned int i, j; BOOL diff; - LPD3DBLOB shader, messages; + ID3DBlob *shader, *messages; for(i = 0; i < count; i++) { /* D3DAssemble sets messages to 0 if there aren't error messages */ @@ -1406,7 +1406,7 @@ static void failure_test(void) { }; HRESULT hr; unsigned int i; - LPD3DBLOB shader, messages; + ID3DBlob *shader, *messages; for(i = 0; i < (sizeof(tests) / sizeof(tests[0])); i++) { shader = NULL; @@ -1533,7 +1533,7 @@ static void assembleshader_test(void) { } }; HRESULT hr; - LPD3DBLOB shader, messages; + ID3DBlob *shader, *messages; struct D3DIncludeImpl include; /* defines test */

1 0

Michael Stefaniuc : d3dxof: Avoid casts from COM objects to interfaces.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 1956eefa0fc7a5abc6a1f33149bd89ca8f57dffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1956eefa0fc7a5abc6a1f3314… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 13 09:48:02 2016 +0200 d3dxof: Avoid casts from COM objects to interfaces. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/d3dxof.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 8aa6c21..5499551 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -900,7 +900,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_Resolve(IDirectXFileDataRefe object->level = 0; object->from_ref = TRUE; - *ppDataObj = (LPDIRECTXFILEDATA)object; + *ppDataObj = &object->IDirectXFileData_iface; return DXFILE_OK; } @@ -1055,10 +1055,10 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE goto error; } - *ppDataObj = (LPDIRECTXFILEDATA)object; + *ppDataObj = &object->IDirectXFileData_iface; /* Get a reference to created object */ - This->pRefObjects[This->nb_xobjects] = (LPDIRECTXFILEDATA)object; + This->pRefObjects[This->nb_xobjects] = &object->IDirectXFileData_iface; IDirectXFileData_AddRef(This->pRefObjects[This->nb_xobjects]); This->nb_xobjects++;

1 0

Austin English : ntoskrnl.exe: Add IoAttachDevice stub.
by Alexandre Julliard July 14, 2016

July 14, 2016

Module: wine Branch: master Commit: 0e5fdf0e00c72bd9e6129823d6ee3c69a74378a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5fdf0e00c72bd9e6129823d… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 11 21:59:22 2016 -0500 ntoskrnl.exe: Add IoAttachDevice stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a52b5df..8003ba1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2502,3 +2502,12 @@ NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE waitmode, BOOLEAN alertab FIXME("(%u, %u, %p): stub\n", waitmode, alertable, interval); return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * IoAttachDevice (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoAttachDevice(DEVICE_OBJECT *source, UNICODE_STRING *target, DEVICE_OBJECT *attached) +{ + FIXME("(%p, %s, %p): stub\n", source, debugstr_us(target), attached); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b688a3f..406c626 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -315,7 +315,7 @@ @ stdcall IoAllocateMdl(ptr long long long ptr) @ stdcall IoAllocateWorkItem(ptr) @ stub IoAssignResources -@ stub IoAttachDevice +@ stdcall IoAttachDevice(ptr ptr ptr) @ stub IoAttachDeviceByPointer @ stdcall IoAttachDeviceToDeviceStack(ptr ptr) @ stub IoAttachDeviceToDeviceStackSafe

1 0