May 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : comcat: Build with msvcrt.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 20b6c7cba5be5cebea585a38913c6c26fd48c86f URL: https://source.winehq.org/git/wine.git/?a=commit;h=20b6c7cba5be5cebea585a38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:40:04 2019 +0200 comcat: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comcat/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in index 2d105df..42061a1 100644 --- a/dlls/comcat/Makefile.in +++ b/dlls/comcat/Makefile.in @@ -1,6 +1,8 @@ MODULE = comcat.dll IMPORTS = ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ comcat_main.c

1 0

Alexandre Julliard : combase: Build with msvcrt.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 6e2241a331eb6a96eb0282a565d56f85e3d3ccf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e2241a331eb6a96eb0282a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:39:37 2019 +0200 combase: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 2 ++ dlls/combase/string.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index df051ad..0f3c9f8 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1,6 +1,8 @@ MODULE = combase.dll IMPORTS = advapi32 ole32 uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ roapi.c \ string.c diff --git a/dlls/combase/string.c b/dlls/combase/string.c index dfbe368..2092e43 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -17,11 +17,11 @@ */ #include <string.h> +#include <wchar.h> #include "windows.h" #include "winerror.h" #include "hstring.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winstring); @@ -427,7 +427,7 @@ HRESULT WINAPI WindowsTrimStringStart(HSTRING str1, HSTRING str2, HSTRING *out) } for (start = 0; start < priv1->length; start++) { - if (!memchrW(priv2->buffer, priv1->buffer[start], priv2->length)) + if (!wmemchr(priv2->buffer, priv1->buffer[start], priv2->length)) break; } return start ? WindowsCreateString(&priv1->buffer[start], priv1->length - start, out) : @@ -454,7 +454,7 @@ HRESULT WINAPI WindowsTrimStringEnd(HSTRING str1, HSTRING str2, HSTRING *out) } for (len = priv1->length; len > 0; len--) { - if (!memchrW(priv2->buffer, priv1->buffer[len - 1], priv2->length)) + if (!wmemchr(priv2->buffer, priv1->buffer[len - 1], priv2->length)) break; } return (len < priv1->length) ? WindowsCreateString(priv1->buffer, len, out) :

1 0

Alexandre Julliard : clusapi: Build with msvcrt.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: ff5d625943a3affd7ed9e9b500333bfb28a4a07b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff5d625943a3affd7ed9e9b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:39:30 2019 +0200 clusapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/clusapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/clusapi/Makefile.in b/dlls/clusapi/Makefile.in index a548f44..2084e28 100644 --- a/dlls/clusapi/Makefile.in +++ b/dlls/clusapi/Makefile.in @@ -1,5 +1,7 @@ MODULE = clusapi.dll IMPORTLIB = clusapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ clusapi.c

1 0

Alexandre Julliard : bthprops.cpl: Build with msvcrt.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 5dcfc55fbe5295d2eca0b6037e2749fa7d97ab53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dcfc55fbe5295d2eca0b603… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:37:41 2019 +0200 bthprops.cpl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bthprops.cpl/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/bthprops.cpl/Makefile.in b/dlls/bthprops.cpl/Makefile.in index 41dc9df..e8236f4 100644 --- a/dlls/bthprops.cpl/Makefile.in +++ b/dlls/bthprops.cpl/Makefile.in @@ -1,4 +1,6 @@ MODULE = bthprops.cpl +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : bluetoothapis: Build with msvcrt.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 113983d23dedb6ba7415e0dea00144c619701a31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=113983d23dedb6ba7415e0de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:36:39 2019 +0200 bluetoothapis: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bluetoothapis/Makefile.in | 2 ++ dlls/bluetoothapis/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/bluetoothapis/Makefile.in b/dlls/bluetoothapis/Makefile.in index 5050cff..d73ca87 100644 --- a/dlls/bluetoothapis/Makefile.in +++ b/dlls/bluetoothapis/Makefile.in @@ -1,4 +1,6 @@ MODULE = bluetoothapis.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/bluetoothapis/main.c b/dlls/bluetoothapis/main.c index 2ff8f67..b035248 100644 --- a/dlls/bluetoothapis/main.c +++ b/dlls/bluetoothapis/main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : avrt: Build with msvcrt.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 18b2228d0eb2225e901bda77e094e0c317491bc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18b2228d0eb2225e901bda77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:36:12 2019 +0200 avrt: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avrt/Makefile.in | 2 ++ dlls/avrt/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avrt/Makefile.in b/dlls/avrt/Makefile.in index 52873fd..49f5b29 100644 --- a/dlls/avrt/Makefile.in +++ b/dlls/avrt/Makefile.in @@ -2,5 +2,7 @@ MODULE = avrt.dll IMPORTLIB = avrt IMPORTS = user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index 7ef2824..eb5704c 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : atmlib: Build with msvcrt.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 5c5d84e02822a53527244c90f6d08191cf9a8ee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c5d84e02822a53527244c90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:35:25 2019 +0200 atmlib: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atmlib/Makefile.in | 2 ++ dlls/atmlib/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/atmlib/Makefile.in b/dlls/atmlib/Makefile.in index 904cbbb..f8bd675 100644 --- a/dlls/atmlib/Makefile.in +++ b/dlls/atmlib/Makefile.in @@ -1,4 +1,6 @@ MODULE = atmlib.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/atmlib/main.c b/dlls/atmlib/main.c index efae51f..4baeb9d 100644 --- a/dlls/atmlib/main.c +++ b/dlls/atmlib/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alistair Leslie-Hughes : bcrypt: Add BCryptDeriveKey stub.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: eb615ea0cbe46e156a7840ad072607c2e7609732 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb615ea0cbe46e156a7840ad… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 28 03:32:57 2019 +0000 bcrypt: Add BCryptDeriveKey stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 7 +++++++ dlls/ncrypt/ncrypt.spec | 2 +- include/bcrypt.h | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index dfe08e7..4946ee5 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -7,7 +7,7 @@ @ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) @ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) @ stub BCryptDeleteContext -@ stub BCryptDeriveKey +@ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long) @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) @ stdcall BCryptDestroyHash(ptr) @ stdcall BCryptDestroyKey(ptr) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 18783f0..399626d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1596,6 +1596,13 @@ NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE secret) return STATUS_SUCCESS; } +NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE secret, LPCWSTR kdf, BCryptBufferDesc *parameter, + PUCHAR derived, ULONG derived_size, ULONG *result, ULONG flags) +{ + FIXME( "%p, %s, %p, %p, %d, %p, %08x\n", secret, debugstr_w(kdf), parameter, derived, derived_size, result, flags ); + return STATUS_INTERNAL_ERROR; +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch (reason) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index d4a32ed..d35f8a9 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -7,7 +7,7 @@ @ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) bcrypt.BCryptCreateHash @ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptDecrypt @ stub BCryptDeleteContext -@ stub BCryptDeriveKey +@ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long) bcrypt.BCryptDeriveKey @ stub BCryptDeriveKeyCapi @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) bcrypt.BCryptDeriveKeyPBKDF2 @ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash diff --git a/include/bcrypt.h b/include/bcrypt.h index f0185d1..b1799d0 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -204,6 +204,20 @@ typedef struct _BCRYPT_KEY_DATA_BLOB_HEADER ULONG cbKeyData; } BCRYPT_KEY_DATA_BLOB_HEADER, *PBCRYPT_KEY_DATA_BLOB_HEADER; +typedef struct _BCryptBuffer +{ + ULONG cbBuffer; + ULONG BufferType; + void *pvBuffer; +} BCryptBuffer, *PBCryptBuffer; + +typedef struct _BCryptBufferDesc +{ + ULONG ulVersion; + ULONG cBuffers; + PBCryptBuffer pBuffers; +} BCryptBufferDesc, *PBCryptBufferDesc; + #define BCRYPT_KEY_DATA_BLOB_MAGIC 0x4d42444b #define BCRYPT_KEY_DATA_BLOB_VERSION1 1 @@ -229,6 +243,7 @@ typedef PVOID BCRYPT_SECRET_HANDLE; NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); +NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE, LPCWSTR, BCryptBufferDesc*, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptDeriveKeyPBKDF2(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, ULONGLONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE); NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);

1 0

Alexandre Julliard : cards: Build with msvcrt.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 9a16c7b547cfac89e2c67ff95a665eaf29cfe431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a16c7b547cfac89e2c67ff9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:39:17 2019 +0200 cards: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cards/Makefile.in | 2 ++ dlls/cards/cards.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cards/Makefile.in b/dlls/cards/Makefile.in index 395b150..8650fda 100644 --- a/dlls/cards/Makefile.in +++ b/dlls/cards/Makefile.in @@ -2,6 +2,8 @@ MODULE = cards.dll IMPORTLIB = cards IMPORTS = user32 gdi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ cards.c diff --git a/dlls/cards/cards.c b/dlls/cards/cards.c index 9bec966..dec25f3 100644 --- a/dlls/cards/cards.c +++ b/dlls/cards/cards.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : avifil32: Build with msvcrt.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: cdf1e763bf75efc400136d34455e8125f843da7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf1e763bf75efc400136d34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:35:57 2019 +0200 avifil32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/Makefile.in | 2 ++ dlls/avifil32/api.c | 3 +-- dlls/avifil32/avifile.c | 3 +-- dlls/avifil32/wavfile.c | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index 4030514..630aa88 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -2,6 +2,8 @@ MODULE = avifil32.dll IMPORTLIB = avifil32 IMPORTS = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ acmstream.c \ api.c \ diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 37fa941..a7f84ba 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -38,7 +38,6 @@ #include "avifile_private.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(avifile); @@ -155,7 +154,7 @@ static BOOL AVIFILE_GetFileHandlerByExtension(LPCWSTR szFile, LPCLSID lpclsid) { CHAR szRegKey[25]; CHAR szValue[100]; - LPWSTR szExt = strrchrW(szFile, '.'); + LPWSTR szExt = wcsrchr(szFile, '.'); LONG len = ARRAY_SIZE(szValue); if (szExt == NULL) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 33c28b1..f3cf484 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -46,7 +46,6 @@ #include "avifile_private.h" #include "extrachunk.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(avifile); @@ -625,7 +624,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, LPOLESTR *p if (*ppszFileName == NULL) return AVIERR_MEMORY; - strcpyW(*ppszFileName, This->szFileName); + lstrcpyW(*ppszFileName, This->szFileName); } return AVIERR_OK; diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 6294ecd..8581a51 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -33,7 +33,6 @@ #include "avifile_private.h" #include "extrachunk.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(avifile); @@ -575,7 +574,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, LPOLESTR *p if (*ppszFileName == NULL) return AVIERR_MEMORY; - strcpyW(*ppszFileName, This->szFileName); + lstrcpyW(*ppszFileName, This->szFileName); } return AVIERR_OK;

1 0