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

Jacek Caban : mshtml/tests: Include leading path slash in location test array.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: adeb76bd15a4acdd741fc7ba66239e0ba230257b URL: https://source.winehq.org/git/wine.git/?a=commit;h=adeb76bd15a4acdd741fc7ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 28 17:33:44 2019 +0200 mshtml/tests: Include leading path slash in location test array. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmllocation.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index 4781de9..3d81eb6 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -47,7 +47,7 @@ static const struct location_test location_tests[] = { "www.winehq.org:80", "www.winehq.org", "80", - "", + "/", "?search", "#hash" }, @@ -59,7 +59,7 @@ static const struct location_test location_tests[] = { "www.winehq.org:80", "www.winehq.org", "80", - "file", + "/file", "?search", "#hash" }, @@ -71,7 +71,7 @@ static const struct location_test location_tests[] = { "ftp.winehq.org:21", "ftp.winehq.org", "21", - "", + "/", NULL, NULL }, @@ -83,7 +83,7 @@ static const struct location_test location_tests[] = { "ftp.winehq.org:21", "ftp.winehq.org", "21", - "file", + "/file", NULL, NULL }, @@ -240,7 +240,7 @@ static void test_pathname(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_pathname(loc, &str); ok(hres == S_OK, "%s: get_pathname failed: 0x%08x\n", test->name, hres); if(hres == S_OK) - ok(str_eq_wa(str, test->pathname), + ok(str_eq_wa(str, *test->pathname == '/' ? test->pathname + 1 : test->pathname), "%s: expected retrieved pathname to be L\"%s\", was: %s\n", test->name, test->pathname, wine_dbgstr_w(str)); SysFreeString(str);

1 0

Jacek Caban : mshtml: Rewrite IHTMLLocation::get_pathname on top of IUri.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: e33ce7c53854c1fe179218265642e9ede4152d39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e33ce7c53854c1fe17921826… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 28 17:33:58 2019 +0200 mshtml: Rewrite IHTMLLocation::get_pathname on top of IUri. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37279 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmllocation.c | 23 +++++++++++++---------- dlls/mshtml/tests/elements.js | 17 +++++++++++++++++ dlls/mshtml/tests/htmllocation.c | 3 +++ dlls/mshtml/tests/script.c | 6 ++++++ 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 4b8a07a..06cf7e1 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -459,7 +459,8 @@ static HRESULT WINAPI HTMLLocation_put_pathname(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_pathname(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + BSTR path; + IUri *uri; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -467,19 +468,21 @@ static HRESULT WINAPI HTMLLocation_get_pathname(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - url.dwUrlPathLength = 1; - url.dwExtraInfoLength = 1; - hres = get_url_components(This, &url); + if(!(uri = get_uri(This))) { + FIXME("No current URI\n"); + return E_NOTIMPL; + } + + hres = IUri_GetPath(uri, &path); if(FAILED(hres)) return hres; - if(url.dwUrlPathLength && url.lpszUrlPath[0] == '/') - *p = SysAllocStringLen(url.lpszUrlPath + 1, url.dwUrlPathLength - 1); - else - *p = SysAllocStringLen(url.lpszUrlPath, url.dwUrlPathLength); + if(hres == S_FALSE) { + SysFreeString(path); + path = NULL; + } - if(!*p) - return E_OUTOFMEMORY; + *p = path; return S_OK; } diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index be37d90..60e4a7e 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -126,6 +126,22 @@ function test_iframe() { }); } +function test_iframe_location() { + document.body.innerHTML = '<iframe src="emptyfile"></iframe>' + var iframe = document.body.firstChild; + + iframe.onload = function() { + ok(iframe.contentWindow.location.pathname === "/emptyfile", + "path = " + iframe.contentWindow.location.pathname); + iframe.onload = function () { + ok(iframe.contentWindow.location.pathname === "/empty/file", + "path = " + iframe.contentWindow.location.pathname); + next_test(); + } + iframe.src = "empty/file"; + } +} + function test_anchor() { var iframe = document.body.firstChild; var anchor = document.createElement("a"); @@ -420,6 +436,7 @@ var tests = [ test_createElementNS, test_head, test_iframe, + test_iframe_location, test_anchor, test_query_selector, test_compare_position, diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index 3d81eb6..120ab7e 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -240,6 +240,9 @@ static void test_pathname(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_pathname(loc, &str); ok(hres == S_OK, "%s: get_pathname failed: 0x%08x\n", test->name, hres); if(hres == S_OK) + /* FIXME: We seem to be testing location in a buggy state. Path names do not + * include leading slash, while other tests confirm that it should be there */ + todo_wine_if(*test->pathname == '/') ok(str_eq_wa(str, *test->pathname == '/' ? test->pathname + 1 : test->pathname), "%s: expected retrieved pathname to be L\"%s\", was: %s\n", test->name, test->pathname, wine_dbgstr_w(str)); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 7d6afd2..e546649 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3087,6 +3087,8 @@ static HRESULT WINAPI ProtocolEx_StartEx(IInternetProtocolEx *iface, IUri *uri, HRSRC src; HRESULT hres; + static const WCHAR empty_prefixW[] = {'/','e','m','p','t','y'}; + hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &This->bind_info); ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres); @@ -3121,6 +3123,10 @@ static HRESULT WINAPI ProtocolEx_StartEx(IInternetProtocolEx *iface, IUri *uri, register_stream(This, query+1); SysFreeString(query); block = TRUE; + }else if(SysStringLen(path) >= ARRAY_SIZE(empty_prefixW) && !memcmp(path, empty_prefixW, sizeof(empty_prefixW))) { + static char empty_data[] = " "; + This->data = empty_data; + This->size = strlen(This->data); }else { src = FindResourceW(NULL, *path == '/' ? path+1 : path, (const WCHAR*)RT_HTML); ok(src != NULL, "Could not find resource for path %s\n", wine_dbgstr_w(path));

1 0

Aric Stewart : winemac.drv: Use NI_COMPOSITIONSTR/ CPS_CANCEL when composition string is empty.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 6d05fae6f7ebab83a2f1c6621d9619bbe91833fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d05fae6f7ebab83a2f1c662… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 24 09:07:55 2019 -0500 winemac.drv: Use NI_COMPOSITIONSTR/CPS_CANCEL when composition string is empty. This sends the expected WM_IME_ENDCOMPOSITION message. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/ime.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 1f5cb6b..a071408 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -901,6 +901,7 @@ static BOOL IME_SetCompositionString(void* hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD flags = 0; WCHAR wParam = 0; LPIMEPRIVATE myPrivate; + BOOL sendMessage = TRUE; TRACE("(%p, %d, %p, %d):\n", hIMC, dwIndex, lpComp, dwCompLen); @@ -943,28 +944,29 @@ static BOOL IME_SetCompositionString(void* hIMC, DWORD dwIndex, LPCVOID lpComp, wParam = ((const WCHAR*)lpComp)[0]; flags |= GCS_COMPCLAUSE | GCS_COMPATTR | GCS_DELTASTART; + + if (cursor_valid) + { + LPCOMPOSITIONSTRING compstr; + compstr = ImmLockIMCC(lpIMC->hCompStr); + compstr->dwCursorPos = cursor_pos; + ImmUnlockIMCC(lpIMC->hCompStr); + flags |= GCS_CURSORPOS; + } } else { - newCompStr = updateCompStr(lpIMC->hCompStr, NULL, 0, &flags); - ImmDestroyIMCC(lpIMC->hCompStr); - lpIMC->hCompStr = newCompStr; - } - - if (cursor_valid) - { - LPCOMPOSITIONSTRING compstr; - compstr = ImmLockIMCC(lpIMC->hCompStr); - compstr->dwCursorPos = cursor_pos; - ImmUnlockIMCC(lpIMC->hCompStr); - flags |= GCS_CURSORPOS; + NotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_CANCEL, 0); + sendMessage = FALSE; } } - GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, wParam, flags); - ImmUnlockIMCC(lpIMC->hPrivate); - UnlockRealIMC(hIMC); + if (sendMessage) { + GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, wParam, flags); + ImmUnlockIMCC(lpIMC->hPrivate); + UnlockRealIMC(hIMC); + } return TRUE; }

1 0

Alexandre Julliard : avifil32: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

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

Alexandre Julliard : avifile: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 1381cad9270a22e4fc0ef28c7da659d620970dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=1381cad9270a22e4fc0ef28c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:36:06 2019 +0200 avifile: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifile.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avifile.dll16/Makefile.in b/dlls/avifile.dll16/Makefile.in index 4152c2f..83407c9 100644 --- a/dlls/avifile.dll16/Makefile.in +++ b/dlls/avifile.dll16/Makefile.in @@ -1,6 +1,6 @@ MODULE = avifile.dll16 IMPORTS = avifil32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,avifil32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,avifil32.dll C_SRCS = \ main.c

1 0

Alexandre Julliard : avrt: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

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 : bluetoothapis: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

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 : browseui: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 7c7a259e7c0cded789b3a5f52c7a5dd44221f621 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c7a259e7c0cded789b3a5f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:37:36 2019 +0200 browseui: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)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; }

1 0

Alexandre Julliard : bthprops.cpl: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

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 : cards: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

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