Module: wine Branch: master Commit: 7c7a259e7c0cded789b3a5f52c7a5dd44221f621 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c7a259e7c0cded789b3a5f52...
Author: Alexandre Julliard julliard@winehq.org Date: Tue May 28 07:37:36 2019 +0200
browseui: Build with msvcrt.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/browseui/Makefile.in | 2 ++ dlls/browseui/aclmulti.c | 3 --- dlls/browseui/aclsource.c | 3 --- dlls/browseui/browseui_main.c | 2 -- dlls/browseui/compcatcachedaemon.c | 3 --- dlls/browseui/progressdlg.c | 9 +++------ 6 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index 0dc50a0..a09649f 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -1,6 +1,8 @@ MODULE = browseui.dll IMPORTS = uuid ole32 comctl32 user32 advapi32
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ aclmulti.c \ aclsource.c \ diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 412a18d..820b246 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" - #include <stdarg.h>
#define COBJMACROS @@ -37,7 +35,6 @@ #include "shlobj.h"
#include "wine/heap.h" -#include "wine/unicode.h"
#include "browseui.h"
diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 0ade9cc..5ac7cb1 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" - #include <stdarg.h>
#define COBJMACROS @@ -37,7 +35,6 @@ #include "shlobj.h"
#include "wine/heap.h" -#include "wine/unicode.h"
#include "browseui.h"
diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 2e31b37..71981d7 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" - #include <stdarg.h> #include <stdio.h>
diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index 1f62441..6de0d87 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" - #include <stdarg.h>
#define COBJMACROS @@ -37,7 +35,6 @@ #include "shlobj.h"
#include "wine/heap.h" -#include "wine/unicode.h"
#include "browseui.h" #include "resids.h" diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 61078a1..bca61f5 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" - #include <stdarg.h>
#define COBJMACROS @@ -37,7 +35,6 @@ #include "shlobj.h"
#include "wine/heap.h" -#include "wine/unicode.h"
#include "browseui.h" #include "resids.h" @@ -100,7 +97,7 @@ static void set_buffer(LPWSTR *buffer, LPCWSTR string) string = empty_string; CoGetMalloc(MEMCTX_TASK, &malloc);
- cb = (strlenW(string) + 1)*sizeof(WCHAR); + cb = (lstrlenW(string) + 1)*sizeof(WCHAR); if (*buffer == NULL || cb > IMalloc_GetSize(malloc, *buffer)) *buffer = IMalloc_Realloc(malloc, *buffer, cb); memcpy(*buffer, string, cb); @@ -119,8 +116,8 @@ static LPWSTR load_string(HINSTANCE hInstance, UINT uiResourceId) LPWSTR ret;
LoadStringW(hInstance, uiResourceId, string, ARRAY_SIZE(string)); - ret = HeapAlloc(GetProcessHeap(), 0, (strlenW(string) + 1) * sizeof(WCHAR)); - strcpyW(ret, string); + ret = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(string) + 1) * sizeof(WCHAR)); + lstrcpyW(ret, string); return ret; }