October 2020 - Wine-Commits

Zebediah Figura : wintrust: Stub CryptCATPutAttrInfo().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 8161d2924fdff58e4897f7deb4c46f502fff7889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8161d2924fdff58e4897f7de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:13 2020 -0500 wintrust: Stub CryptCATPutAttrInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 13 +++++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 10 ++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index de2e95b4593..96a2ab1965b 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -848,6 +848,19 @@ BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info return TRUE; } +/*********************************************************************** + * CryptCATPutAttrInfo (WINTRUST.@) + */ +CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *member, + WCHAR *name, DWORD flags, DWORD size, BYTE *data) +{ + FIXME("catalog %p, member %p, name %s, flags %#x, size %u, data %p, stub!\n", + catalog, member, debugstr_w(name), flags, size, data); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + /*********************************************************************** * CryptCATPutMemberInfo (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 2f369c169ce..025241a808c 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -35,7 +35,7 @@ @ stub CryptCATHandleFromStore @ stdcall CryptCATOpen(wstr long long long long) @ stdcall CryptCATPersistStore(ptr) -@ stub CryptCATPutAttrInfo +@ stdcall CryptCATPutAttrInfo(ptr ptr wstr long long ptr) @ stub CryptCATPutCatAttrInfo @ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) @ stub CryptCATStoreFromHandle diff --git a/include/mscat.h b/include/mscat.h index d3e9a7e560d..79b92b213ab 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -28,6 +28,15 @@ typedef HANDLE HCATINFO; extern "C" { #endif +#define CRYPTCAT_ATTR_NAMEASCII 0x00000001 +#define CRYPTCAT_ATTR_NAMEOBJID 0x00000002 +#define CRYPTCAT_ATTR_DATAASCII 0x00010000 +#define CRYPTCAT_ATTR_DATAOBJID 0x00020000 +#define CRYPTCAT_ATTR_DATAREPLACE 0x00040000 +#define CRYPTCAT_ATTR_NO_AUTO_COMPAT_ENTRY 0x01000000 +#define CRYPTCAT_ATTR_AUTHENTICATED 0x10000000 +#define CRYPTCAT_ATTR_UNAUTHENTICATED 0x20000000 + #define CRYPTCAT_OPEN_CREATENEW 0x00000001 #define CRYPTCAT_OPEN_ALWAYS 0x00000002 #define CRYPTCAT_OPEN_EXISTING 0x00000004 @@ -132,6 +141,7 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATGetCatAttrInfo(HANDLE, LPWSTR); CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); BOOL WINAPI CryptCATPersistStore(HANDLE catalog); +CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *member, WCHAR *name, DWORD flags, DWORD size, BYTE *data); CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data); #ifdef __cplusplus

1 0

Zebediah Figura : wintrust: Stub CryptCATPutCatAttrInfo().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 3ea7b3d3b96b29a86a3ce70e9bc763a1318ec79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ea7b3d3b96b29a86a3ce70e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:14 2020 -0500 wintrust: Stub CryptCATPutCatAttrInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 13 +++++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 96a2ab1965b..be869ad8277 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -861,6 +861,19 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *m return NULL; } +/*********************************************************************** + * CryptCATPutCatAttrInfo (WINTRUST.@) + */ +CRYPTCATATTRIBUTE * WINAPI CryptCATPutCatAttrInfo(HANDLE catalog, + WCHAR *name, DWORD flags, DWORD size, BYTE *data) +{ + FIXME("catalog %p, name %s, flags %#x, size %u, data %p, stub!\n", + catalog, debugstr_w(name), flags, size, data); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + /*********************************************************************** * CryptCATPutMemberInfo (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 025241a808c..8226c80c05f 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -36,7 +36,7 @@ @ stdcall CryptCATOpen(wstr long long long long) @ stdcall CryptCATPersistStore(ptr) @ stdcall CryptCATPutAttrInfo(ptr ptr wstr long long ptr) -@ stub CryptCATPutCatAttrInfo +@ stdcall CryptCATPutCatAttrInfo(ptr wstr long long ptr) @ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) @ stub CryptCATStoreFromHandle @ stub CryptCATVerifyMember diff --git a/include/mscat.h b/include/mscat.h index 79b92b213ab..366dbbb0d1e 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -142,6 +142,7 @@ CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); BOOL WINAPI CryptCATPersistStore(HANDLE catalog); CRYPTCATATTRIBUTE * WINAPI CryptCATPutAttrInfo(HANDLE catalog, CRYPTCATMEMBER *member, WCHAR *name, DWORD flags, DWORD size, BYTE *data); +CRYPTCATATTRIBUTE * WINAPI CryptCATPutCatAttrInfo(HANDLE catalog, WCHAR *name, DWORD flags, DWORD size, BYTE *data); CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data); #ifdef __cplusplus

1 0

Zebediah Figura : wintrust: Stub CryptCATPersistStore().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: de22b7b334057d59b68468c8ffde382bc200eb87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de22b7b334057d59b68468c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:12 2020 -0500 wintrust: Stub CryptCATPersistStore(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 11 +++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 15b21a299f3..de2e95b4593 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -861,6 +861,17 @@ CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, return NULL; } +/*********************************************************************** + * CryptCATPersistStore (WINTRUST.@) + */ +BOOL WINAPI CryptCATPersistStore(HANDLE catalog) +{ + FIXME("catalog %p, stub!\n", catalog); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /*********************************************************************** * CryptCATOpen (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index a01d1dd93c9..2f369c169ce 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -34,7 +34,7 @@ @ stdcall CryptCATGetMemberInfo(ptr wstr) @ stub CryptCATHandleFromStore @ stdcall CryptCATOpen(wstr long long long long) -@ stub CryptCATPersistStore +@ stdcall CryptCATPersistStore(ptr) @ stub CryptCATPutAttrInfo @ stub CryptCATPutCatAttrInfo @ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) diff --git a/include/mscat.h b/include/mscat.h index 3931b71596c..d3e9a7e560d 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -131,6 +131,7 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATGetAttrInfo(HANDLE, CRYPTCATMEMBER *, LPWSTR) CRYPTCATATTRIBUTE * WINAPI CryptCATGetCatAttrInfo(HANDLE, LPWSTR); CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); +BOOL WINAPI CryptCATPersistStore(HANDLE catalog); CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data); #ifdef __cplusplus

1 0

Zebediah Figura : mssign32: Stub SignerSign().
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 5e9df0bb15a897bb2404f5e78a31d29c17517a52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e9df0bb15a897bb2404f5e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:15 2020 -0500 mssign32: Stub SignerSign(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mssign32/mssign32.spec | 2 +- dlls/mssign32/mssign32_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mssign32/mssign32.spec b/dlls/mssign32/mssign32.spec index f25e23e9169..d4ea5a25caf 100644 --- a/dlls/mssign32/mssign32.spec +++ b/dlls/mssign32/mssign32.spec @@ -23,7 +23,7 @@ @ stub SignerAddTimeStampResponseEx @ stub SignerCreateTimeStampRequest @ stdcall SignerFreeSignerContext(ptr) -@ stub SignerSign +@ stdcall SignerSign(ptr ptr ptr ptr wstr ptr ptr) @ stdcall SignerSignEx(long ptr ptr ptr ptr wstr ptr ptr ptr) @ stub SignerTimeStamp @ stub SignerTimeStampEx diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index da7551e6d1b..416f836fc40 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -74,6 +74,13 @@ void WINAPI PvkFreeCryptProv(HCRYPTPROV hProv, LPCWSTR pwszCapiProvider, DWORD d debugstr_w(pwszTmpContainer)); } +HRESULT WINAPI SignerSign(SIGNER_SUBJECT_INFO *subject, SIGNER_CERT *cert, SIGNER_SIGNATURE_INFO *signature, + SIGNER_PROVIDER_INFO *provider, const WCHAR *timestamp, CRYPT_ATTRIBUTES *attrs, void *sip_data) +{ + FIXME("%p %p %p %p %s %p %p stub\n", subject, cert, signature, provider, debugstr_w(timestamp), attrs, sip_data); + return E_NOTIMPL; +} + HRESULT WINAPI SignerSignEx(DWORD flags, SIGNER_SUBJECT_INFO *subject_info, SIGNER_CERT *signer_cert, SIGNER_SIGNATURE_INFO *signature_info, SIGNER_PROVIDER_INFO *provider_info, const WCHAR *http_time_stamp, CRYPT_ATTRIBUTES *request, void *sip_data,

1 0

Michael Stefaniuc : dsound: Use wide-char string literals.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 716cfcb163a5fe670023155a751fcfd83cc3b28f URL: https://source.winehq.org/git/wine.git/?a=commit;h=716cfcb163a5fe670023155a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:26 2020 +0200 dsound: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_main.c | 10 +++------- dlls/dsound/propset.c | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 3acee554ad9..ca33ba48046 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -88,7 +88,7 @@ CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0, GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; -const WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; +const WCHAR wine_vxd_drv[] = L"winemm.vxd"; /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ int ds_hel_buflen = 32768 * 2; @@ -454,10 +454,6 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, BOOL keep_going; HRESULT hr, init_hr; - static const WCHAR primary_desc[] = {'P','r','i','m','a','r','y',' ', - 'S','o','u','n','d',' ','D','r','i','v','e','r',0}; - static const WCHAR empty_drv[] = {0}; - init_hr = get_mmdevenum(&devenum); if(!devenum) return init_hr; @@ -484,8 +480,8 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, return DS_OK; } - TRACE("Calling back with NULL (%s)\n", wine_dbgstr_w(primary_desc)); - keep_going = cb(NULL, primary_desc, empty_drv, user); + TRACE("Calling back with NULL (Primary Sound Driver)\n"); + keep_going = cb(NULL, L"Primary Sound Driver", L"", user); /* always send the default device first */ if(keep_going){ diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index dcb2b871783..f1f71bef135 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); -static WCHAR wInterface[] = { 'I','n','t','e','r','f','a','c','e',0 }; +static WCHAR wInterface[] = L"Interface"; typedef struct IKsPrivatePropertySetImpl {

1 0

Louis Lenders : dwmapi: Quiet noisy fixme.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 0c361793c3347caa06561eb3a3c6e2519e87bcec URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c361793c3347caa06561eb3… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Oct 19 10:31:29 2020 +0200 dwmapi: Quiet noisy fixme. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index eb11ecb6b7f..45c33c2169a 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -103,7 +103,9 @@ HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL opaque_blend) */ HRESULT WINAPI DwmFlush(void) { - FIXME("() stub\n"); + static BOOL once; + + if (!once++) FIXME("() stub\n"); return E_NOTIMPL; }

1 0

Esme Povirk : windowscodecs: Start loading PNG in unix lib.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 6aa8e179759ddba104b5682984048a61922f85f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aa8e179759ddba104b56829… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:17 2020 -0500 windowscodecs: Start loading PNG in unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 159 ++++++++++++++++++++++++++++++++- dlls/windowscodecs/main.c | 19 ++++ dlls/windowscodecs/pngformat.c | 21 ++++- dlls/windowscodecs/unix_iface.c | 14 ++- dlls/windowscodecs/unix_lib.c | 15 ++++ dlls/windowscodecs/wincodecs_common.h | 5 ++ dlls/windowscodecs/wincodecs_private.h | 20 +++++ 7 files changed, 247 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6aa8e179759ddba104b5…

1 0

Esme Povirk : windowscodecs: Get PNG frame information from unix lib.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 8b849e814bcf28368324620c8742bad888ac55d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b849e814bcf28368324620c… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:18 2020 -0500 windowscodecs: Get PNG frame information from unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 201 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 96 ++-------------- dlls/windowscodecs/unix_iface.c | 7 ++ dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 5 + dlls/windowscodecs/wincodecs_private.h | 13 +++ 6 files changed, 238 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b849e814bcf28368324…

1 0

Esme Povirk : windowscodecs: Move PNG CopyPixels to unix lib.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 53ce545e69e1cf88bd0949fb8981ff70a2f264b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ce545e69e1cf88bd0949fb… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:19 2020 -0500 windowscodecs: Move PNG CopyPixels to unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 54 ++++++++++++++++++++++++++ dlls/windowscodecs/main.c | 65 ------------------------------- dlls/windowscodecs/pngformat.c | 3 +- dlls/windowscodecs/unix_iface.c | 8 ++++ dlls/windowscodecs/unix_lib.c | 3 ++ dlls/windowscodecs/wincodecs_common.h | 71 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 6 +++ 7 files changed, 143 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53ce545e69e1cf88bd09…

1 0

Esme Povirk : windowscodecs: Use the unix library to find PNG metadata.
by Alexandre Julliard Oct. 19, 2020

Oct. 19, 2020

Module: wine Branch: master Commit: 70ea6485e8b4d46c59e9675807055d1e641f0b4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=70ea6485e8b4d46c59e96758… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:20 2020 -0500 windowscodecs: Use the unix library to find PNG metadata. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 77 ++++++++++++++++++ dlls/windowscodecs/main.c | 1 + dlls/windowscodecs/pngformat.c | 143 +++++---------------------------- dlls/windowscodecs/unix_iface.c | 8 ++ dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 51 ++++++++++++ dlls/windowscodecs/wincodecs_private.h | 15 ++++ 7 files changed, 174 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70ea6485e8b4d46c59e9…

1 0