wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Henri Verbeet : wined3d: Move the "tid" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 0781596cb66f20befacf8c607ef19a0cc9edbb05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0781596cb66f20befacf8c60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 7 17:40:27 2019 +0430 wined3d: Move the "tid" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e56284..8744570 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1917,7 +1917,6 @@ static void wined3d_context_init(struct wined3d_context *context, struct wined3d context->swapchain = swapchain; context->current_rt.texture = swapchain->front_buffer; context->current_rt.sub_resource_idx = 0; - context->tid = GetCurrentThreadId(); context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) | (1u << WINED3D_SHADER_TYPE_VERTEX) @@ -1956,6 +1955,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi gl_info = context->gl_info; d3d_info = context->d3d_info; + context_gl->tid = GetCurrentThreadId(); context_gl->window = context->swapchain->win_handle; if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) { @@ -2324,7 +2324,7 @@ void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) device_context_remove(device, &context_gl->c); - if (context_gl->c.current && context_gl->c.tid != GetCurrentThreadId()) + if (context_gl->c.current && context_gl->tid != GetCurrentThreadId()) { struct wined3d_gl_info *gl_info; @@ -4264,7 +4264,7 @@ struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_g struct wined3d_context *acquired_context; struct wined3d_device *device; - if (!context_gl || context_gl->c.tid != GetCurrentThreadId()) + if (!context_gl || context_gl->tid != GetCurrentThreadId()) return NULL; device = context_gl->c.device; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c18f730..dd9ec12 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1126,7 +1126,7 @@ struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchai for (i = 0; i < swapchain->num_contexts; ++i) { - if (swapchain->context[i]->tid == tid) + if (wined3d_context_gl(swapchain->context[i])->tid == tid) return swapchain->context[i]; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8272a56..4471e7c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1900,7 +1900,6 @@ struct wined3d_context struct wined3d_texture *texture; unsigned int sub_resource_idx; } current_rt; - DWORD tid; /* Thread ID which owns this context at the moment */ /* Stores some information about the context state for optimization */ DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ @@ -1967,6 +1966,8 @@ struct wined3d_context_gl { struct wined3d_context c; + DWORD tid; /* Thread ID which owns this context at the moment. */ + uint32_t dc_is_private : 1; uint32_t dc_has_format : 1; /* Only meaningful for private DCs. */ uint32_t fog_enabled : 1;

1 0

Alexandre Julliard : mciwave: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: f33a33700d7fd979e087a5b9aea112c926d1002e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f33a33700d7fd979e087a5b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:58:58 2019 +0200 mciwave: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciwave/Makefile.in | 2 ++ dlls/mciwave/mciwave.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mciwave/Makefile.in b/dlls/mciwave/Makefile.in index 7df9538..b96726d 100644 --- a/dlls/mciwave/Makefile.in +++ b/dlls/mciwave/Makefile.in @@ -1,5 +1,7 @@ MODULE = mciwave.dll IMPORTS = winmm user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mciwave.c diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 0fa9b20..78f26c2 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -32,7 +32,6 @@ #include "wownt32.h" #include "digitalv.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mciwave); @@ -466,7 +465,7 @@ static LRESULT WAVE_mciOpenFile(WINE_MCIWAVE* wmw, LPCWSTR filename) fn = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR)); if (!fn) return MCIERR_OUT_OF_MEMORY; - strcpyW(fn, filename); + lstrcpyW(fn, filename); HeapFree(GetProcessHeap(), 0, wmw->lpFileName); wmw->lpFileName = fn;

1 0

Alexandre Julliard : mciseq: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 8ce096a9f0b76aae9810e2faa2d1a60988f2bceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce096a9f0b76aae9810e2fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:58:47 2019 +0200 mciseq: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciseq/Makefile.in | 2 ++ dlls/mciseq/mcimidi.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mciseq/Makefile.in b/dlls/mciseq/Makefile.in index 161a3de..79e5163 100644 --- a/dlls/mciseq/Makefile.in +++ b/dlls/mciseq/Makefile.in @@ -1,5 +1,7 @@ MODULE = mciseq.dll IMPORTS = winmm user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mcimidi.c diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 864ab98..c6bc860 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -32,12 +32,12 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wingdi.h" #include "winuser.h" #include "wownt32.h" #include "mmddk.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mcimidi); @@ -692,8 +692,8 @@ static DWORD MIDI_mciOpen(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_OPEN_PARMSW lp return MCIERR_FILE_NOT_FOUND; } wmm->lpstrElementName = HeapAlloc(GetProcessHeap(), 0, - (strlenW(lpParms->lpstrElementName) + 1) * sizeof(WCHAR)); - strcpyW(wmm->lpstrElementName, lpParms->lpstrElementName); + (lstrlenW(lpParms->lpstrElementName) + 1) * sizeof(WCHAR)); + lstrcpyW(wmm->lpstrElementName, lpParms->lpstrElementName); } } TRACE("hFile=%p\n", wmm->hFile);

1 0

Alexandre Julliard : mciqtz32: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 106f2feafadc88fe74c3419dbf44398d9d842866 URL: https://source.winehq.org/git/wine.git/?a=commit;h=106f2feafadc88fe74c3419d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:58:32 2019 +0200 mciqtz32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mciqtz32/Makefile.in b/dlls/mciqtz32/Makefile.in index 4aa7e11..c38bbc4 100644 --- a/dlls/mciqtz32/Makefile.in +++ b/dlls/mciqtz32/Makefile.in @@ -1,6 +1,8 @@ MODULE = mciqtz32.dll IMPORTS = strmiids oleaut32 ole32 winmm user32 gdi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mciqtz.c

1 0

Alexandre Julliard : mcicda: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 5007d260275055cc4592d7a7e6d92381fc8a966c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5007d260275055cc4592d7a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:58:17 2019 +0200 mcicda: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mcicda/Makefile.in | 2 ++ dlls/mcicda/mcicda.c | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mcicda/Makefile.in b/dlls/mcicda/Makefile.in index fad0689..9bfee00 100644 --- a/dlls/mcicda/Makefile.in +++ b/dlls/mcicda/Makefile.in @@ -1,5 +1,7 @@ MODULE = mcicda.dll IMPORTS = winmm user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mcicda.c diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 18881ef..e23ba5a 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> #include <string.h> @@ -36,7 +35,6 @@ #include "ntddcdrm.h" #include "winternl.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "dsound.h" WINE_DEFAULT_DEBUG_CHANNEL(mcicda); @@ -683,7 +681,7 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) } res = CDROM_Audio_GetSerial(&toc); - sprintfW(buffer, wszLu, res); + swprintf(buffer, ARRAY_SIZE(buffer), wszLu, res); str = buffer; } else { WARN("Don't know this info command (%u)\n", dwFlags);

1 0

Alexandre Julliard : mciavi32: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 3e95920286526579272bdb193479751180e8ffab URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e95920286526579272bdb19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:58:05 2019 +0200 mciavi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/Makefile.in | 2 ++ dlls/mciavi32/info.c | 1 - dlls/mciavi32/mciavi.c | 7 +++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mciavi32/Makefile.in b/dlls/mciavi32/Makefile.in index e7fe6ba..f880b09 100644 --- a/dlls/mciavi32/Makefile.in +++ b/dlls/mciavi32/Makefile.in @@ -1,6 +1,8 @@ MODULE = mciavi32.dll IMPORTS = msvfw32 winmm user32 gdi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ info.c \ mciavi.c \ diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index 3d138b1..d516c4d 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -21,7 +21,6 @@ #include <string.h> #include "private_mciavi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mciavi); diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 9aa6cd8..d8df240 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -40,7 +40,6 @@ #include <string.h> #include "private_mciavi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mciavi); @@ -253,13 +252,13 @@ static DWORD MCIAVI_mciOpen(UINT wDevID, DWORD dwFlags, /* FIXME : what should be done id wma->hFile is already != 0, or the driver is playin' */ TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(lpOpenParms->lpstrElementName)); - wma->lpFileName = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpOpenParms->lpstrElementName) + 1) * sizeof(WCHAR)); - strcpyW(wma->lpFileName, lpOpenParms->lpstrElementName); + wma->lpFileName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(lpOpenParms->lpstrElementName) + 1) * sizeof(WCHAR)); + lstrcpyW(wma->lpFileName, lpOpenParms->lpstrElementName); if (lpOpenParms->lpstrElementName[0] == '@') { /* The file name @11223344 encodes an AVIFile handle in decimal notation * in Win3.1 and w2k/NT, but this feature is absent in win95 (KB140750). - * wma->hFile = LongToHandle(strtolW(lpOpenParms->lpstrElementName+1, NULL, 10)); */ + * wma->hFile = LongToHandle(wcstol(lpOpenParms->lpstrElementName+1, NULL, 10)); */ FIXME("Using AVIFile/Stream %s NIY\n", debugstr_w(lpOpenParms->lpstrElementName)); } wma->hFile = mmioOpenW(lpOpenParms->lpstrElementName, NULL,

1 0

Alexandre Julliard : mapistub: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 1b9706ef9b7254837d53b7e93c85d115fb186c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b9706ef9b7254837d53b7e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:57:44 2019 +0200 mapistub: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapistub/Makefile.in | 2 ++ dlls/mapistub/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mapistub/Makefile.in b/dlls/mapistub/Makefile.in index 93671ae..63e06a4 100644 --- a/dlls/mapistub/Makefile.in +++ b/dlls/mapistub/Makefile.in @@ -1,4 +1,6 @@ MODULE = mapistub.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/mapistub/main.c b/dlls/mapistub/main.c index 51ff43b..d1d8117 100644 --- a/dlls/mapistub/main.c +++ b/dlls/mapistub/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

Alexandre Julliard : mapi32: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 70f552c617cf3517c5c2513484e21e6815d8f13a URL: https://source.winehq.org/git/wine.git/?a=commit;h=70f552c617cf3517c5c25134… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:57:34 2019 +0200 mapi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/Makefile.in | 2 ++ dlls/mapi32/prop.c | 19 +++++++++---------- dlls/mapi32/sendmail.c | 2 -- dlls/mapi32/util.c | 9 ++++----- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 3811fd1..305522c 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -2,6 +2,8 @@ MODULE = mapi32.dll IMPORTLIB = mapi32 IMPORTS = uuid shlwapi shell32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ imalloc.c \ mapi32_main.c \ diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 0700e5c..55baf91 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -29,7 +29,6 @@ #include "shlwapi.h" #include "wine/list.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mapival.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); @@ -91,7 +90,7 @@ SCODE WINAPI PropCopyMore(LPSPropValue lpDest, LPSPropValue lpSrc, memcpy(lpDest->Value.lpszA, lpSrc->Value.lpszA, ulLen); break; case PT_UNICODE: - ulLen = (strlenW(lpSrc->Value.lpszW) + 1u) * sizeof(WCHAR); + ulLen = (lstrlenW(lpSrc->Value.lpszW) + 1u) * sizeof(WCHAR); scode = lpMore(ulLen, lpOrig, (LPVOID*)&lpDest->Value.lpszW); if (SUCCEEDED(scode)) memcpy(lpDest->Value.lpszW, lpSrc->Value.lpszW, ulLen); @@ -156,7 +155,7 @@ SCODE WINAPI PropCopyMore(LPSPropValue lpDest, LPSPropValue lpSrc, for (i = 0; i < lpSrc->Value.MVszW.cValues; i++) { - ULONG ulStrLen = strlenW(lpSrc->Value.MVszW.lppszW[i]) + 1u; + ULONG ulStrLen = lstrlenW(lpSrc->Value.MVszW.lppszW[i]) + 1u; lpDest->Value.MVszW.lppszW[i] = lpNextStr; memcpy(lpNextStr, lpSrc->Value.MVszW.lppszW[i], ulStrLen * sizeof(WCHAR)); @@ -263,7 +262,7 @@ ULONG WINAPI UlPropSize(LPSPropValue lpProp) break; case PT_MV_UNICODE: ulRet = 0u; for (i = 0; i < lpProp->Value.MVszW.cValues; i++) - ulRet += (strlenW(lpProp->Value.MVszW.lppszW[i]) + 1u); + ulRet += (lstrlenW(lpProp->Value.MVszW.lppszW[i]) + 1u); ulRet *= sizeof(WCHAR); break; case PT_UNICODE: ulRet = (lstrlenW(lpProp->Value.lpszW) + 1u) * sizeof(WCHAR); @@ -504,7 +503,7 @@ LONG WINAPI LPropCompareProp(LPSPropValue lpPropLeft, LPSPropValue lpPropRight) case PT_STRING8: return lstrcmpA(lpPropLeft->Value.lpszA, lpPropRight->Value.lpszA); case PT_UNICODE: - return strcmpW(lpPropLeft->Value.lpszW, lpPropRight->Value.lpszW); + return lstrcmpW(lpPropLeft->Value.lpszW, lpPropRight->Value.lpszW); case PT_ERROR: if (lpPropLeft->Value.err > lpPropRight->Value.err) return 1; @@ -828,7 +827,7 @@ SCODE WINAPI ScCopyProps(int cValues, LPSPropValue lpProps, LPVOID lpDst, ULONG lpDataDest += ulLen; break; case PT_UNICODE: - ulLen = (strlenW(lpProps->Value.lpszW) + 1u) * sizeof(WCHAR); + ulLen = (lstrlenW(lpProps->Value.lpszW) + 1u) * sizeof(WCHAR); lpDest->Value.lpszW = (LPWSTR)lpDataDest; memcpy(lpDest->Value.lpszW, lpProps->Value.lpszW, ulLen); lpDataDest += ulLen; @@ -867,7 +866,7 @@ SCODE WINAPI ScCopyProps(int cValues, LPSPropValue lpProps, LPVOID lpDst, ULONG for (i = 0; i < lpProps->Value.MVszW.cValues; i++) { - ULONG ulStrLen = (strlenW(lpProps->Value.MVszW.lppszW[i]) + 1u) * sizeof(WCHAR); + ULONG ulStrLen = (lstrlenW(lpProps->Value.MVszW.lppszW[i]) + 1u) * sizeof(WCHAR); lpDest->Value.MVszW.lppszW[i] = (LPWSTR)lpDataDest; memcpy(lpDataDest, lpProps->Value.MVszW.lppszW[i], ulStrLen); @@ -981,7 +980,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld, ulLen = bBadPtr ? 0 : (lstrlenW(lpDest->Value.lpszW) + 1u) * sizeof(WCHAR); lpDest->Value.lpszW = (LPWSTR)RELOC_PTR(lpDest->Value.lpszW); if (bBadPtr) - ulLen = (strlenW(lpDest->Value.lpszW) + 1u) * sizeof(WCHAR); + ulLen = (lstrlenW(lpDest->Value.lpszW) + 1u) * sizeof(WCHAR); ulCount += ulLen; break; case PT_BINARY: @@ -1020,11 +1019,11 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld, for (i = 0; i < lpDest->Value.MVszW.cValues; i++) { - ULONG ulStrLen = bBadPtr ? 0 : (strlenW(lpDest->Value.MVszW.lppszW[i]) + 1u) * sizeof(WCHAR); + ULONG ulStrLen = bBadPtr ? 0 : (lstrlenW(lpDest->Value.MVszW.lppszW[i]) + 1u) * sizeof(WCHAR); lpDest->Value.MVszW.lppszW[i] = (LPWSTR)RELOC_PTR(lpDest->Value.MVszW.lppszW[i]); if (bBadPtr) - ulStrLen = (strlenW(lpDest->Value.MVszW.lppszW[i]) + 1u) * sizeof(WCHAR); + ulStrLen = (lstrlenW(lpDest->Value.MVszW.lppszW[i]) + 1u) * sizeof(WCHAR); ulCount += ulStrLen; } break; diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 407dd13..e1b7a68 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdarg.h> diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 9c3b019..7e324a0 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -33,7 +33,6 @@ #include "objbase.h" #include "shlwapi.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "mapival.h" #include "xcmc.h" #include "msi.h" @@ -404,7 +403,7 @@ VOID WINAPI SwapPword(PUSHORT lpData, ULONG ulLen) ULONG WINAPI MNLS_lstrlenW(LPCWSTR lpszStr) { TRACE("(%s)\n", debugstr_w(lpszStr)); - return strlenW(lpszStr); + return lstrlenW(lpszStr); } /************************************************************************* @@ -423,7 +422,7 @@ ULONG WINAPI MNLS_lstrlenW(LPCWSTR lpszStr) INT WINAPI MNLS_lstrcmpW(LPCWSTR lpszLeft, LPCWSTR lpszRight) { TRACE("(%s,%s)\n", debugstr_w(lpszLeft), debugstr_w(lpszRight)); - return strcmpW(lpszLeft, lpszRight); + return lstrcmpW(lpszLeft, lpszRight); } /************************************************************************* @@ -443,7 +442,7 @@ ULONG WINAPI MNLS_lstrcpyW(LPWSTR lpszDest, LPCWSTR lpszSrc) ULONG len; TRACE("(%p,%s)\n", lpszDest, debugstr_w(lpszSrc)); - len = (strlenW(lpszSrc) + 1) * sizeof(WCHAR); + len = (lstrlenW(lpszSrc) + 1) * sizeof(WCHAR); memcpy(lpszDest, lpszSrc, len); return len; } @@ -494,7 +493,7 @@ BOOL WINAPI FEqualNames(LPMAPINAMEID lpName1, LPMAPINAMEID lpName2) return FALSE; if (lpName1->ulKind == MNID_STRING) - return !strcmpW(lpName1->Kind.lpwstrName, lpName2->Kind.lpwstrName); + return !lstrcmpW(lpName1->Kind.lpwstrName, lpName2->Kind.lpwstrName); return lpName1->Kind.lID == lpName2->Kind.lID; }

1 0

Alexandre Julliard : lzexpand: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: e62ef2709f01924cb61d6a2c52f422875704490f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e62ef2709f01924cb61d6a2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:56:16 2019 +0200 lzexpand: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/lzexpand.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/lzexpand.dll16/Makefile.in b/dlls/lzexpand.dll16/Makefile.in index b44a1eb..0269e46 100644 --- a/dlls/lzexpand.dll16/Makefile.in +++ b/dlls/lzexpand.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = lzexpand.dll16 IMPORTS = lz32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,lz32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,lz32.dll C_SRCS = lzexpand.c

1 0

Alexandre Julliard : localui: Build with msvcrt.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 21d95abef8184a7f99e8abdc3da8a762aca46567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21d95abef8184a7f99e8abdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:56:06 2019 +0200 localui: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localui/Makefile.in | 2 ++ dlls/localui/localui.c | 17 ++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in index eb4273f..70b7254 100644 --- a/dlls/localui/Makefile.in +++ b/dlls/localui/Makefile.in @@ -1,6 +1,8 @@ MODULE = localui.dll IMPORTS = winspool user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ localui.c diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index 77c8bf0..ab8f5c9 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -30,7 +30,6 @@ #include "ddk/winsplp.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "localui.h" WINE_DEFAULT_DEBUG_CHANNEL(localui); @@ -187,7 +186,7 @@ static void dlg_port_already_exists(HWND hWnd, LPCWSTR portname) message = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (message) { message[0] = '\0'; - snprintfW(message, len, res_PortExistsW, portname); + swprintf(message, len, res_PortExistsW, portname); MessageBoxW(hWnd, message, res_PortW, MB_OK | MB_ICONERROR); HeapFree(GetProcessHeap(), 0, message); } @@ -213,7 +212,7 @@ static void dlg_invalid_portname(HWND hWnd, LPCWSTR portname) message = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (message) { message[0] = '\0'; - snprintfW(message, len, res_InvalidNameW, portname); + swprintf(message, len, res_InvalidNameW, portname); MessageBoxW(hWnd, message, res_PortW, MB_OK | MB_ICONERROR); HeapFree(GetProcessHeap(), 0, message); } @@ -380,7 +379,7 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP /* native localui.dll use the same limits */ if ((res > 0) && (res < 1000000) && status) { - sprintfW(bufferW, fmt_uW, res); + swprintf(bufferW, ARRAY_SIZE(bufferW), fmt_uW, res); res = XcvDataW( data->hXcv, cmd_ConfigureLPTPortCommandOKW, (PBYTE) bufferW, (lstrlenW(bufferW) +1) * sizeof(WCHAR), @@ -416,13 +415,13 @@ static DWORD get_type_from_name(LPCWSTR name) { HANDLE hfile; - if (!strncmpiW(name, portname_LPT, ARRAY_SIZE(portname_LPT) -1)) + if (!wcsnicmp(name, portname_LPT, ARRAY_SIZE(portname_LPT) -1)) return PORT_IS_LPT; - if (!strncmpiW(name, portname_COM, ARRAY_SIZE(portname_COM) -1)) + if (!wcsnicmp(name, portname_COM, ARRAY_SIZE(portname_COM) -1)) return PORT_IS_COM; - if (!strcmpiW(name, portname_FILE)) + if (!wcsicmp(name, portname_FILE)) return PORT_IS_FILE; if (name[0] == '/') @@ -431,10 +430,10 @@ static DWORD get_type_from_name(LPCWSTR name) if (name[0] == '|') return PORT_IS_PIPE; - if (!strncmpW(name, portname_CUPS, ARRAY_SIZE(portname_CUPS) -1)) + if (!wcsncmp(name, portname_CUPS, ARRAY_SIZE(portname_CUPS) -1)) return PORT_IS_CUPS; - if (!strncmpW(name, portname_LPR, ARRAY_SIZE(portname_LPR) -1)) + if (!wcsncmp(name, portname_LPR, ARRAY_SIZE(portname_LPR) -1)) return PORT_IS_LPR; /* Must be a file or a directory. Does the file exist ? */

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2019