February 2015 - Wine-commits

Henri Verbeet : d3d10core: Implement d3d10_pixel_shader_SetPrivateData().
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: cae40a165361e2fc57eb7891cc4c463fc501ff4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae40a165361e2fc57eb7891c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 12:29:43 2015 +0100 d3d10core: Implement d3d10_pixel_shader_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/shader.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 8526cf2..1756afc 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -229,6 +229,7 @@ struct d3d10_pixel_shader ID3D10PixelShader ID3D10PixelShader_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; ID3D10Device1 *device; }; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index dbd6132..cdd0608 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -560,10 +560,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelSh static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateData(ID3D10PixelShader *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateDataInterface(ID3D10PixelShader *iface, @@ -589,6 +591,9 @@ static const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl = static void STDMETHODCALLTYPE d3d10_pixel_shader_wined3d_object_destroyed(void *parent) { + struct d3d10_pixel_shader *shader = parent; + + wined3d_private_store_cleanup(&shader->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -608,12 +613,14 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ shader->ID3D10PixelShader_iface.lpVtbl = &d3d10_pixel_shader_vtbl; shader->refcount = 1; + wined3d_private_store_init(&shader->private_store); shader_info.input_signature = &input_signature; shader_info.output_signature = &output_signature; if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info))) { ERR("Failed to extract shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return hr; } @@ -629,6 +636,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ if (FAILED(hr)) { WARN("Failed to create wined3d pixel shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return E_INVALIDARG; }

1 0

Nikolay Sivov : scrrun: It' s not allowed to change compare mode when dictionary is not empty.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 778d4da2d9e9f899013ce52a2aa30ada263542ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=778d4da2d9e9f899013ce52a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 26 17:27:02 2015 +0300 scrrun: It's not allowed to change compare mode when dictionary is not empty. --- dlls/scrrun/dictionary.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index a33e1de..958d7fc 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -41,6 +41,7 @@ typedef struct LONG ref; CompareMethod method; + LONG count; } dictionary; static inline dictionary *impl_from_IDictionary(IDictionary *iface) @@ -200,14 +201,13 @@ static HRESULT WINAPI dictionary_Add(IDictionary *iface, VARIANT *Key, VARIANT * return E_NOTIMPL; } -static HRESULT WINAPI dictionary_get_Count(IDictionary *iface, LONG *pCount) +static HRESULT WINAPI dictionary_get_Count(IDictionary *iface, LONG *count) { dictionary *This = impl_from_IDictionary(iface); - FIXME("(%p)->(%p)\n", This, pCount); - - *pCount = 0; + TRACE("(%p)->(%p)\n", This, count); + *count = This->count; return S_OK; } @@ -271,6 +271,9 @@ static HRESULT WINAPI dictionary_put_CompareMode(IDictionary *iface, CompareMeth TRACE("(%p)->(%d)\n", This, method); + if (This->count) + return CTL_E_ILLEGALFUNCTIONCALL; + This->method = method; return S_OK; } @@ -411,6 +414,7 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, This->IDictionary_iface.lpVtbl = &dictionary_vtbl; This->ref = 1; This->method = BinaryCompare; + This->count = 0; *obj = &This->IDictionary_iface;

1 0

Nikolay Sivov : include: Fix REPASTESPECIAL definition.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 8f517054d236967411042d7ff68e68b23214b1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f517054d236967411042d7ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 26 18:07:37 2015 +0300 include: Fix REPASTESPECIAL definition. Spotted by Christoph von Wittich. --- include/richedit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/richedit.h b/include/richedit.h index 6b27fc9..ce2c145 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -691,7 +691,7 @@ typedef struct _reqresize { typedef struct _repastespecial { DWORD dwAspect; - DWORD dwParam; + DWORD_PTR dwParam; } REPASTESPECIAL; typedef struct _punctuation {

1 0

Nikolay Sivov : include: Fix packing of DWM_BLURBEHIND.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 1fcc75299f3e640ec60ef3caade9d14fa2e1299a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcc75299f3e640ec60ef3caa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 26 18:15:17 2015 +0300 include: Fix packing of DWM_BLURBEHIND. Spotted by Christoph von Wittich. --- include/dwmapi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dwmapi.h b/include/dwmapi.h index db13b5f..3c5ed8f 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -95,8 +95,6 @@ typedef struct _MilMatrix3x2D DOUBLE DY; } MilMatrix3x2D; -#include <poppack.h> - #define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 #define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 @@ -109,6 +107,8 @@ typedef struct _DWM_BLURBEHIND BOOL fTransitionOnMaximized; } DWM_BLURBEHIND, *PDWM_BLURBEHIND; +#include <poppack.h> + DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT);

1 0

Vincent Povirk : crypt32: Add test for PKCS_RSA_PRIVATE_KEY decoding.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 0c7ebefd679d00812e85576412c9f2a402537ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7ebefd679d00812e8557641… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 26 13:44:52 2015 -0600 crypt32: Add test for PKCS_RSA_PRIVATE_KEY decoding. --- dlls/crypt32/tests/encode.c | 283 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c7ebefd679d00812e855…

1 0

Vincent Povirk : crypt32: Implement PKCS_RSA_PRIVATE_KEY decoding.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 7fb8ee199521241d637f82ebf1f662de819b1e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb8ee199521241d637f82ebf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 26 14:48:05 2015 -0600 crypt32: Implement PKCS_RSA_PRIVATE_KEY decoding. --- dlls/crypt32/decode.c | 144 ++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 4 +- 2 files changed, 146 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index e5f8baf..90d8cdf 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3936,6 +3936,147 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey(DWORD dwCertEncodingType, return ret; } +#define RSA2_MAGIC 0x32415352 + +struct DECODED_RSA_PRIV_KEY +{ + DWORD version; + DWORD pubexp; + CRYPT_INTEGER_BLOB modulus; + CRYPT_INTEGER_BLOB privexp; + CRYPT_INTEGER_BLOB prime1; + CRYPT_INTEGER_BLOB prime2; + CRYPT_INTEGER_BLOB exponent1; + CRYPT_INTEGER_BLOB exponent2; + CRYPT_INTEGER_BLOB coefficient; +}; + +static BOOL WINAPI CRYPT_AsnDecodeRsaPrivKey(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + DWORD halflen; + + __TRY + { + struct AsnDecodeSequenceItem items[] = { + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, version), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, modulus), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, modulus.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, pubexp), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, privexp), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, privexp.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, prime1), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, prime1.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, prime2), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, prime2.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, exponent1), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, exponent1.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, exponent2), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, exponent2.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, coefficient), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, coefficient.pbData), + 0 }, + }; + struct DECODED_RSA_PRIV_KEY *decodedKey = NULL; + DWORD size = 0; + + ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &decodedKey, + &size, NULL, NULL); + if (ret) + { + halflen = decodedKey->modulus.cbData / 2; + if ((decodedKey->modulus.cbData != halflen * 2) || + (decodedKey->prime1.cbData != halflen) || + (decodedKey->prime2.cbData != halflen) || + (decodedKey->exponent1.cbData != halflen) || + (decodedKey->exponent2.cbData != halflen) || + (decodedKey->coefficient.cbData != halflen) || + (decodedKey->privexp.cbData != halflen * 2)) + { + ret = FALSE; + SetLastError(CRYPT_E_BAD_ENCODE); + } + + if (ret) + { + DWORD bytesNeeded = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + (halflen * 9); + + if (!pvStructInfo) + { + *pcbStructInfo = bytesNeeded; + ret = TRUE; + } + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, bytesNeeded))) + { + BLOBHEADER *hdr; + RSAPUBKEY *rsaPubKey; + BYTE *vardata; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + + hdr = pvStructInfo; + hdr->bType = PRIVATEKEYBLOB; + hdr->bVersion = CUR_BLOB_VERSION; + hdr->reserved = 0; + hdr->aiKeyAlg = CALG_RSA_KEYX; + + rsaPubKey = (RSAPUBKEY *)((BYTE *)pvStructInfo + + sizeof(BLOBHEADER)); + rsaPubKey->magic = RSA2_MAGIC; + rsaPubKey->pubexp = decodedKey->pubexp; + rsaPubKey->bitlen = halflen * 16; + + vardata = (BYTE*)(rsaPubKey + 1); + memcpy(vardata, + decodedKey->modulus.pbData, halflen * 2); + memcpy(vardata + halflen * 2, + decodedKey->prime1.pbData, halflen); + memcpy(vardata + halflen * 3, + decodedKey->prime2.pbData, halflen); + memcpy(vardata + halflen * 4, + decodedKey->exponent1.pbData, halflen); + memcpy(vardata + halflen * 5, + decodedKey->exponent2.pbData, halflen); + memcpy(vardata + halflen * 6, + decodedKey->coefficient.pbData, halflen); + memcpy(vardata + halflen * 7, + decodedKey->privexp.pbData, halflen * 2); + } + } + + LocalFree(decodedKey); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static BOOL CRYPT_AsnDecodeOctetsInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -5798,6 +5939,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(RSA_CSP_PUBLICKEYBLOB): decodeFunc = CRYPT_AsnDecodeRsaPubKey; break; + case LOWORD(PKCS_RSA_PRIVATE_KEY): + decodeFunc = CRYPT_AsnDecodeRsaPrivKey; + break; case LOWORD(X509_UNICODE_NAME): decodeFunc = CRYPT_AsnDecodeUnicodeName; break; diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 3240a84..b45b5f2 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8101,7 +8101,7 @@ static void test_decodeRsaPrivateKey(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, PKCS_RSA_PRIVATE_KEY, rsaPrivKeyDer, sizeof(rsaPrivKeyDer)-10, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - todo_wine ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD), + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD), "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); @@ -8110,7 +8110,7 @@ static void test_decodeRsaPrivateKey(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, PKCS_RSA_PRIVATE_KEY, rsaPrivKeyDer, sizeof(rsaPrivKeyDer), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Nikolay Sivov : advapi32: Fix trace format for access mask in OpenService( ).
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 7520297a49c9b058a5ddbfaec6bfb0c2b0d22c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7520297a49c9b058a5ddbfaec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 23:25:48 2015 +0300 advapi32: Fix trace format for access mask in OpenService(). --- dlls/advapi32/service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 4657bd9..f2d37ca 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -921,7 +921,7 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, LPWSTR lpServiceNameW; SC_HANDLE ret; - TRACE("%p %s %d\n", hSCManager, debugstr_a(lpServiceName), dwDesiredAccess); + TRACE("%p %s 0x%08x\n", hSCManager, debugstr_a(lpServiceName), dwDesiredAccess); lpServiceNameW = SERV_dup(lpServiceName); ret = OpenServiceW( hSCManager, lpServiceNameW, dwDesiredAccess); @@ -940,7 +940,7 @@ DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, { DWORD err; - TRACE("%p %s %d\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); + TRACE("%p %s 0x%08x\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); if (!hSCManager) return ERROR_INVALID_HANDLE;

1 0

Nikolay Sivov : services: Make RPC interface compatible with native.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 0f80d4b61966af776365486c139c3e6238b984d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f80d4b61966af776365486c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 01:16:40 2015 +0300 services: Make RPC interface compatible with native. --- dlls/advapi32/service.c | 66 +++++- include/wine/svcctl.idl | 544 +++++++++++++++++++++++++++++++++++++++++------- programs/services/rpc.c | 318 ++++++++++++++++++++++++++-- 3 files changed, 821 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f80d4b61966af7763654…

1 0

Nikolay Sivov : advapi32: Forward to CreateServiceWOW64W() when appropriate.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: daf0af431310f647d1849cb15f4f237f22cc9cfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf0af431310f647d1849cb15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 01:20:48 2015 +0300 advapi32: Forward to CreateServiceWOW64W() when appropriate. --- dlls/advapi32/service.c | 21 ++++++++++++++++----- programs/services/rpc.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 8e4dda8..f9b370b 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1057,11 +1057,22 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, __TRY { - err = svcctl_CreateServiceW(hSCManager, lpServiceName, - lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, - lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (const BYTE*)lpDependencies, - multisz_cb(lpDependencies), lpServiceStartName, (const BYTE*)lpPassword, passwdlen, - (SC_RPC_HANDLE *)&handle); + BOOL is_wow64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (is_wow64) + err = svcctl_CreateServiceWOW64W(hSCManager, lpServiceName, + lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, + lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (const BYTE*)lpDependencies, + multisz_cb(lpDependencies), lpServiceStartName, (const BYTE*)lpPassword, passwdlen, + (SC_RPC_HANDLE *)&handle); + else + err = svcctl_CreateServiceW(hSCManager, lpServiceName, + lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, + lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (const BYTE*)lpDependencies, + multisz_cb(lpDependencies), lpServiceStartName, (const BYTE*)lpPassword, passwdlen, + (SC_RPC_HANDLE *)&handle); } __EXCEPT(rpc_filter) { diff --git a/programs/services/rpc.c b/programs/services/rpc.c index d8ae117..43eb3cd 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -463,7 +463,7 @@ static DWORD parse_dependencies(const WCHAR *dependencies, struct service_entry return ERROR_SUCCESS; } -DWORD __cdecl svcctl_CreateServiceW( +static DWORD create_serviceW( SC_RPC_HANDLE hSCManager, LPCWSTR lpServiceName, LPCWSTR lpDisplayName, @@ -479,7 +479,8 @@ DWORD __cdecl svcctl_CreateServiceW( LPCWSTR lpServiceStartName, const BYTE *lpPassword, DWORD dwPasswordSize, - SC_RPC_HANDLE *phService) + SC_RPC_HANDLE *phService, + BOOL is_wow64) { struct service_entry *entry, *found; struct sc_manager_handle *manager; @@ -562,6 +563,30 @@ DWORD __cdecl svcctl_CreateServiceW( return create_handle_for_service(entry, dwDesiredAccess, phService); } +DWORD __cdecl svcctl_CreateServiceW( + SC_RPC_HANDLE hSCManager, + LPCWSTR lpServiceName, + LPCWSTR lpDisplayName, + DWORD dwDesiredAccess, + DWORD dwServiceType, + DWORD dwStartType, + DWORD dwErrorControl, + LPCWSTR lpBinaryPathName, + LPCWSTR lpLoadOrderGroup, + DWORD *lpdwTagId, + const BYTE *lpDependencies, + DWORD dwDependenciesSize, + LPCWSTR lpServiceStartName, + const BYTE *lpPassword, + DWORD dwPasswordSize, + SC_RPC_HANDLE *phService) +{ + WINE_TRACE("(%s, %s, 0x%x, %s)\n", wine_dbgstr_w(lpServiceName), wine_dbgstr_w(lpDisplayName), dwDesiredAccess, wine_dbgstr_w(lpBinaryPathName)); + return create_serviceW(hSCManager, lpServiceName, lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, + dwErrorControl, lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, lpDependencies, dwDependenciesSize, lpServiceStartName, + lpPassword, dwPasswordSize, phService, FALSE); +} + DWORD __cdecl svcctl_DeleteService( SC_RPC_HANDLE hService) { @@ -1521,8 +1546,9 @@ DWORD __cdecl svcctl_CreateServiceWOW64W( DWORD password_size, SC_RPC_HANDLE *service) { - WINE_FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + WINE_TRACE("(%s, %s, 0x%x, %s)\n", wine_dbgstr_w(servicename), wine_dbgstr_w(displayname), accessmask, wine_dbgstr_w(imagepath)); + return create_serviceW(scmanager, servicename, displayname, accessmask, service_type, start_type, error_control, imagepath, + loadordergroup, tagid, dependencies, depend_size, start_name, password, password_size, service, TRUE); } DWORD __cdecl svcctl_unknown46(void)

1 0

Nikolay Sivov : services: Mark WOW64 services in registry.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 1896064332f785a69f665d02e220d5878ead5bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1896064332f785a69f665d02e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 01:30:54 2015 +0300 services: Mark WOW64 services in registry. --- programs/services/rpc.c | 1 + programs/services/services.c | 15 +++++++++++++-- programs/services/services.h | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 43eb3cd..9ecc09c 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -510,6 +510,7 @@ static DWORD create_serviceW( } entry->ref_count = 1; + entry->is_wow64 = is_wow64; entry->config.dwServiceType = entry->status.dwServiceType = dwServiceType; entry->config.dwStartType = dwStartType; entry->config.dwErrorControl = dwErrorControl; diff --git a/programs/services/services.c b/programs/services/services.c index 54d9e89..dd79770 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -66,7 +66,7 @@ static const WCHAR SZ_OBJECT_NAME[] = {'O','b','j','e','c','t','N','a','m' static const WCHAR SZ_TAG[] = {'T','a','g',0}; static const WCHAR SZ_DESCRIPTION[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR SZ_PRESHUTDOWN[] = {'P','r','e','s','h','u','t','d','o','w','n','T','i','m','e','o','u','t',0}; - +static const WCHAR SZ_WOW64[] = {'W','O','W','6','4',0}; DWORD service_create(LPCWSTR name, struct service_entry **entry) { @@ -108,7 +108,7 @@ void free_service_entry(struct service_entry *entry) static DWORD load_service_config(HKEY hKey, struct service_entry *entry) { - DWORD err; + DWORD err, value = 0; WCHAR *wptr; if ((err = load_reg_string(hKey, SZ_IMAGE_PATH, TRUE, &entry->config.lpBinaryPathName)) != 0) @@ -137,6 +137,9 @@ static DWORD load_service_config(HKEY hKey, struct service_entry *entry) if ((err = load_reg_dword(hKey, SZ_PRESHUTDOWN, &entry->preshutdown_timeout)) != 0) return err; + if (load_reg_dword(hKey, SZ_WOW64, &value) == 0 && value == 1) + entry->is_wow64 = TRUE; + WINE_TRACE("Image path = %s\n", wine_dbgstr_w(entry->config.lpBinaryPathName) ); WINE_TRACE("Group = %s\n", wine_dbgstr_w(entry->config.lpLoadOrderGroup) ); WINE_TRACE("Service account name = %s\n", wine_dbgstr_w(entry->config.lpServiceStartName) ); @@ -216,6 +219,14 @@ DWORD save_service_config(struct service_entry *entry) goto cleanup; if ((err = RegSetValueExW(hKey, SZ_PRESHUTDOWN, 0, REG_DWORD, (LPBYTE)&entry->preshutdown_timeout, sizeof(DWORD))) != 0) goto cleanup; + if ((err = RegSetValueExW(hKey, SZ_PRESHUTDOWN, 0, REG_DWORD, (LPBYTE)&entry->preshutdown_timeout, sizeof(DWORD))) != 0) + goto cleanup; + if (entry->is_wow64) + { + const DWORD is_wow64 = 1; + if ((err = RegSetValueExW(hKey, SZ_WOW64, 0, REG_DWORD, (LPBYTE)&is_wow64, sizeof(DWORD))) != 0) + goto cleanup; + } if (entry->config.dwTagId) err = RegSetValueExW(hKey, SZ_TAG, 0, REG_DWORD, (LPBYTE)&entry->config.dwTagId, sizeof(DWORD)); diff --git a/programs/services/services.h b/programs/services/services.h index 88a84ad..9090542 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -49,6 +49,7 @@ struct service_entry HANDLE overlapped_event; HANDLE status_changed_event; BOOL marked_for_delete; + BOOL is_wow64; }; extern struct scmdatabase *active_database;

1 0