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

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_bind_bo().
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: 3faa9e92a5af35b647e661532e4d9932274e933b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3faa9e92a5af35b647e66153… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 7 17:40:28 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_bind_bo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 +++- dlls/wined3d/context.c | 21 ++++++++++++--------- dlls/wined3d/view.c | 3 ++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1069d05..8dc6d4b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -135,7 +135,9 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc /* Context activation is done by the caller. */ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { - context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + + wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8744570..1f187f3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2514,12 +2514,12 @@ void wined3d_context_gl_active_texture(struct wined3d_context_gl *context_gl, context_gl->active_texture = unit; } -void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) +void wined3d_context_gl_bind_bo(struct wined3d_context_gl *context_gl, GLenum binding, GLuint name) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (binding == GL_ELEMENT_ARRAY_BUFFER) - context_invalidate_state(context, STATE_INDEXBUFFER); + context_invalidate_state(&context_gl->c, STATE_INDEXBUFFER); GL_EXTCALL(glBindBuffer(binding, name)); } @@ -2591,6 +2591,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; BYTE *memory; @@ -2598,7 +2599,7 @@ void *context_map_bo_address(struct wined3d_context *context, return data->addr; gl_info = context->gl_info; - context_bind_bo(context, binding, data->buffer_object); + wined3d_context_gl_bind_bo(context_gl, binding, data->buffer_object); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { @@ -2611,7 +2612,7 @@ void *context_map_bo_address(struct wined3d_context *context, memory += (INT_PTR)data->addr; } - context_bind_bo(context, binding, 0); + wined3d_context_gl_bind_bo(context_gl, binding, 0); checkGLcall("Map buffer object"); return memory; @@ -2620,15 +2621,16 @@ void *context_map_bo_address(struct wined3d_context *context, void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; if (!data->buffer_object) return; gl_info = context->gl_info; - context_bind_bo(context, binding, data->buffer_object); + wined3d_context_gl_bind_bo(context_gl, binding, data->buffer_object); GL_EXTCALL(glUnmapBuffer(binding)); - context_bind_bo(context, binding, 0); + wined3d_context_gl_bind_bo(context_gl, binding, 0); checkGLcall("Unmap buffer object"); } @@ -2636,6 +2638,7 @@ void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; BYTE *dst_ptr, *src_ptr; @@ -2664,13 +2667,13 @@ void context_copy_bo_address(struct wined3d_context *context, } else if (!dst->buffer_object && src->buffer_object) { - context_bind_bo(context, src_binding, src->buffer_object); + wined3d_context_gl_bind_bo(context_gl, src_binding, src->buffer_object); GL_EXTCALL(glGetBufferSubData(src_binding, (GLintptr)src->addr, size, dst->addr)); checkGLcall("buffer download"); } else if (dst->buffer_object && !src->buffer_object) { - context_bind_bo(context, dst_binding, dst->buffer_object); + wined3d_context_gl_bind_bo(context_gl, dst_binding, dst->buffer_object); GL_EXTCALL(glBufferSubData(dst_binding, (GLintptr)dst->addr, size, src->addr)); checkGLcall("buffer upload"); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index b43dcdd..4456a10 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1034,6 +1034,7 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format_gl *format; struct wined3d_buffer_gl *buffer_gl; @@ -1067,7 +1068,7 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); get_buffer_view_range(&buffer_gl->b, &view->desc, &format->f, &offset, &size); - context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); + wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); GL_EXTCALL(glClearBufferSubData(buffer_gl->buffer_type_hint, format->internal, offset, size, format->format, format->type, clear_value)); checkGLcall("clear unordered access view"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4471e7c..6402ec1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2081,6 +2081,7 @@ void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_ struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; +void wined3d_context_gl_bind_bo(struct wined3d_context_gl *context_gl, GLenum binding, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; @@ -2237,7 +2238,6 @@ void wined3d_raw_blitter_create(struct wined3d_blitter **next, BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding,

1 0

Henri Verbeet : wined3d: Move the "tid" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard June 10, 2019

June 10, 2019

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 : mciavi32: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

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 : mapi32: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

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 : localspl: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: 8c98417cfd24b1fc34ee24f1d068ed5e8c7f403f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c98417cfd24b1fc34ee24f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:55:52 2019 +0200 localspl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/Makefile.in | 2 ++ dlls/localspl/localmon.c | 16 ++++++++-------- dlls/localspl/provider.c | 29 ++++++++++++++--------------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index f0de382..abff68a 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -1,6 +1,8 @@ MODULE = localspl.dll IMPORTS = spoolss user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ localmon.c \ localspl_main.c \ diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index f540367..6937e05 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #define COBJMACROS @@ -35,7 +36,6 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(localspl); @@ -279,13 +279,13 @@ static DWORD get_type_from_name(LPCWSTR name) { HANDLE hfile; - if (!strncmpW(name, portname_LPT, ARRAY_SIZE(portname_LPT) - 1)) + if (!wcsncmp(name, portname_LPT, ARRAY_SIZE(portname_LPT) - 1)) return PORT_IS_LPT; - if (!strncmpW(name, portname_COM, ARRAY_SIZE(portname_COM) - 1)) + if (!wcsncmp(name, portname_COM, ARRAY_SIZE(portname_COM) - 1)) return PORT_IS_COM; - if (!strcmpW(name, portname_FILE)) + if (!lstrcmpW(name, portname_FILE)) return PORT_IS_FILE; if (name[0] == '/') @@ -294,10 +294,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 ? */ @@ -663,7 +663,7 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE needed = sizeof(buffer) - sizeof(WCHAR); res = RegQueryValueExW(hroot, TransmissionRetryTimeoutW, NULL, NULL, (LPBYTE) buffer, &needed); if ((res == ERROR_SUCCESS) && (buffer[0])) { - *((LPDWORD) pOutputData) = strtoulW(buffer, NULL, 0); + *((LPDWORD) pOutputData) = wcstoul(buffer, NULL, 0); } RegCloseKey(hroot); } @@ -696,7 +696,7 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE if (!lstrcmpW(pszDataName, cmd_SetDefaultCommConfigW)) { /* get the portname from the Handle */ - ptr = strchrW(((xcv_t *)hXcv)->nameW, ' '); + ptr = wcschr(((xcv_t *)hXcv)->nameW, ' '); if (ptr) { ptr++; /* skip the space */ } diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index c17d982..cb31b19 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -34,7 +34,6 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" -#include "wine/unicode.h" #include "localspl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(localspl); @@ -222,9 +221,9 @@ static BOOL apd_copyfile( WCHAR *pathname, WCHAR *file_part, apd_data_t *apd ) else { srcname = apd->src; - strcatW( srcname, file_part ); + lstrcatW( srcname, file_part ); } - strcatW( apd->dst, file_part ); + lstrcatW( apd->dst, file_part ); TRACE("%s => %s\n", debugstr_w(srcname), debugstr_w(apd->dst)); @@ -260,7 +259,7 @@ static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) server = &name[2]; /* skip over both backslash, find separator '\' */ - ptr = strchrW(server, '\\'); + ptr = wcschr(server, '\\'); serverlen = (ptr) ? ptr - server : lstrlenW(server); /* servername is empty */ @@ -277,7 +276,7 @@ static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) len = ARRAY_SIZE(buffer); if (GetComputerNameW(buffer, &len)) { - if ((serverlen == len) && (strncmpiW(server, buffer, len) == 0)) { + if ((serverlen == len) && (wcsnicmp(server, buffer, len) == 0)) { /* The requested Servername is our computername */ return 0; } @@ -296,7 +295,7 @@ static LPCWSTR get_basename_from_name(LPCWSTR name) if (name == NULL) return NULL; if ((name[0] == '\\') && (name[1] == '\\')) { /* skip over the servername and search for the following '\' */ - name = strchrW(&name[2], '\\'); + name = wcschr(&name[2], '\\'); if ((name) && (name[1])) { /* found a separator ('\') followed by a name: skip over the separator and return the rest */ @@ -1197,7 +1196,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) } if (printername) { len = ARRAY_SIZE(XcvMonitorW) - 1; - if (strncmpW(printername, XcvMonitorW, len) == 0) { + if (wcsncmp(printername, XcvMonitorW, len) == 0) { /* OpenPrinter(",XcvMonitor ", ...) detected */ TRACE(",XcvMonitor: %s\n", debugstr_w(&printername[len])); printer->pm = monitor_load(&printername[len], NULL); @@ -1211,7 +1210,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) else { len = ARRAY_SIZE(XcvPortW) - 1; - if (strncmpW( printername, XcvPortW, len) == 0) { + if (wcsncmp( printername, XcvPortW, len) == 0) { /* OpenPrinter(",XcvPort ", ...) detected */ TRACE(",XcvPort: %s\n", debugstr_w(&printername[len])); printer->pm = monitor_load_by_port(&printername[len]); @@ -1272,7 +1271,7 @@ end: static inline WCHAR *get_file_part( WCHAR *name ) { - WCHAR *ptr = strrchrW( name, '\\' ); + WCHAR *ptr = wcsrchr( name, '\\' ); if (ptr) return ptr + 1; return name; } @@ -1364,22 +1363,22 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo sizeof(DWORD)); file = get_file_part( di.pDriverPath ); - RegSetValueExW( hdrv, driverW, 0, REG_SZ, (LPBYTE)file, (strlenW( file ) + 1) * sizeof(WCHAR) ); + RegSetValueExW( hdrv, driverW, 0, REG_SZ, (LPBYTE)file, (lstrlenW( file ) + 1) * sizeof(WCHAR) ); apd_copyfile( di.pDriverPath, file, &apd ); file = get_file_part( di.pDataFile ); - RegSetValueExW( hdrv, data_fileW, 0, REG_SZ, (LPBYTE)file, (strlenW( file ) + 1) * sizeof(WCHAR) ); + RegSetValueExW( hdrv, data_fileW, 0, REG_SZ, (LPBYTE)file, (lstrlenW( file ) + 1) * sizeof(WCHAR) ); apd_copyfile( di.pDataFile, file, &apd ); file = get_file_part( di.pConfigFile ); - RegSetValueExW( hdrv, configuration_fileW, 0, REG_SZ, (LPBYTE)file, (strlenW( file ) + 1) * sizeof(WCHAR) ); + RegSetValueExW( hdrv, configuration_fileW, 0, REG_SZ, (LPBYTE)file, (lstrlenW( file ) + 1) * sizeof(WCHAR) ); apd_copyfile( di.pConfigFile, file, &apd ); /* settings for level 3 */ if (di.pHelpFile) { file = get_file_part( di.pHelpFile ); - RegSetValueExW( hdrv, help_fileW, 0, REG_SZ, (LPBYTE)file, (strlenW( file ) + 1) * sizeof(WCHAR) ); + RegSetValueExW( hdrv, help_fileW, 0, REG_SZ, (LPBYTE)file, (lstrlenW( file ) + 1) * sizeof(WCHAR) ); apd_copyfile( di.pHelpFile, file, &apd ); } else @@ -1390,10 +1389,10 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo WCHAR *reg, *reg_ptr, *in_ptr; reg = reg_ptr = HeapAlloc( GetProcessHeap(), 0, multi_sz_lenW( di.pDependentFiles ) ); - for (in_ptr = di.pDependentFiles; *in_ptr; in_ptr += strlenW( in_ptr ) + 1) + for (in_ptr = di.pDependentFiles; *in_ptr; in_ptr += lstrlenW( in_ptr ) + 1) { file = get_file_part( in_ptr ); - len = strlenW( file ) + 1; + len = lstrlenW( file ) + 1; memcpy( reg_ptr, file, len * sizeof(WCHAR) ); reg_ptr += len; apd_copyfile( in_ptr, file, &apd );

1 0

Henri Verbeet : wined3d: Upload texture data through the texture ops in wined3d_cs_exec_blt_sub_resource ().
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: c7badafb9ca3ceb9361d0e2e07f5075bb35af498 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7badafb9ca3ceb9361d0e2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 7 17:40:31 2019 +0430 wined3d: Upload texture data through the texture ops in wined3d_cs_exec_blt_sub_resource(). Since we want to avoid directly calling GL-specific code here. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/texture.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e1f94f4..a95ba50 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2242,10 +2242,10 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * wined3d_texture_get_pitch(src_texture, op->src_sub_resource_idx % src_texture->level_count, &row_pitch, &slice_pitch); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE); - wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, - dst_texture->resource.format, &op->src_box, wined3d_const_bo_address(&addr), - row_pitch, slice_pitch, op->dst_box.left, op->dst_box.top, op->dst_box.front, FALSE); + dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&addr), + dst_texture->resource.format, &op->src_box, row_pitch, slice_pitch, dst_texture, + op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, + op->dst_box.left, op->dst_box.top, op->dst_box.front); wined3d_texture_validate_location(dst_texture, op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, op->dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index dc60d87..6e1cc04 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2453,9 +2453,39 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in } } +static void wined3d_texture_gl_upload_data(struct wined3d_context *context, + const struct wined3d_const_bo_address *src_bo_addr, const struct wined3d_format *src_format, + const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, + struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, unsigned int dst_location, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) +{ + BOOL srgb = FALSE; + + TRACE("context %p, src_bo_addr %s, src_format %s, src_box %s, src_row_pitch %u, src_slice_pitch %u, " + "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_x %u, dst_y %u, dst_z %u.\n", + context, debug_const_bo_address(src_bo_addr), debug_d3dformat(src_format->id), debug_box(src_box), + src_row_pitch, src_slice_pitch, dst_texture, dst_sub_resource_idx, + wined3d_debug_location(dst_location), dst_x, dst_y, dst_z); + + if (dst_location == WINED3D_LOCATION_TEXTURE_SRGB) + { + srgb = TRUE; + } + else if (dst_location != WINED3D_LOCATION_TEXTURE_RGB) + { + FIXME("Unhandled location %s.\n", wined3d_debug_location(dst_location)); + return; + } + + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), srgb); + wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, src_format, + src_box, src_bo_addr, src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, srgb); +} + static const struct wined3d_texture_ops texture2d_ops = { texture2d_load_location, + wined3d_texture_gl_upload_data, }; struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource) @@ -2829,6 +2859,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in static const struct wined3d_texture_ops texture1d_ops = { texture1d_load_location, + wined3d_texture_gl_upload_data, }; static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, @@ -3244,6 +3275,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in static const struct wined3d_texture_ops texture3d_ops = { texture3d_load_location, + wined3d_texture_gl_upload_data, }; HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4214083..70a3c63 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3382,6 +3382,10 @@ struct wined3d_texture_ops { BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); + void (*texture_upload_data)(struct wined3d_context *context, const struct wined3d_const_bo_address *src_bo_addr, + const struct wined3d_format *src_format, const struct wined3d_box *src_box, unsigned int src_row_pitch, + unsigned int src_slice_pitch, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + unsigned int dst_location, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z); }; #define WINED3D_TEXTURE_COND_NP2 0x00000001

1 0

Alexandre Julliard : mciqtz32: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

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

Nikolay Sivov : mf: Implement stream flushing for sample grabber.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: 880559b2b4b8202811af85482fe68d24455cdd74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=880559b2b4b8202811af8548… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 7 16:09:00 2019 +0300 mf: Implement stream flushing for sample grabber. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index ed07116..9cf9465 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -171,7 +171,7 @@ static ULONG WINAPI sample_grabber_stream_AddRef(IMFStreamSink *iface) return refcount; } -static void stream_release_pending_item(struct sample_grabber_stream *stream, struct scheduled_item *item) +static void stream_release_pending_item(struct scheduled_item *item) { list_remove(&item->entry); switch (item->type) @@ -211,7 +211,7 @@ static ULONG WINAPI sample_grabber_stream_Release(IMFStreamSink *iface) } LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &stream->items, struct scheduled_item, entry) { - stream_release_pending_item(stream, item); + stream_release_pending_item(item); } DeleteCriticalSection(&stream->cs); heap_free(stream); @@ -392,7 +392,7 @@ static HRESULT stream_queue_sample(struct sample_grabber_stream *stream, IMFSamp if (SUCCEEDED(hr)) list_add_tail(&stream->items, &item->entry); else - stream_release_pending_item(stream, item); + stream_release_pending_item(item); return hr; } @@ -459,7 +459,7 @@ static HRESULT stream_place_marker(struct sample_grabber_stream *stream, MFSTREA if (SUCCEEDED(hr)) list_add_tail(&stream->items, &item->entry); else - stream_release_pending_item(stream, item); + stream_release_pending_item(item); return hr; } @@ -487,9 +487,34 @@ static HRESULT WINAPI sample_grabber_stream_PlaceMarker(IMFStreamSink *iface, MF static HRESULT WINAPI sample_grabber_stream_Flush(IMFStreamSink *iface) { - FIXME("%p.\n", iface); + struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); + struct scheduled_item *item, *next_item; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + + EnterCriticalSection(&stream->cs); + + LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &stream->items, struct scheduled_item, entry) + { + /* Samples are discarded, markers are processed immediately. */ + switch (item->type) + { + case ITEM_TYPE_SAMPLE: + break; + case ITEM_TYPE_MARKER: + sample_grabber_stream_report_marker(stream, &item->u.marker.context, E_ABORT); + break; + } + + stream_release_pending_item(item); + } + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static const IMFStreamSinkVtbl sample_grabber_stream_vtbl = @@ -706,7 +731,7 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba case ITEM_TYPE_SAMPLE: if (FAILED(hr = sample_grabber_report_sample(stream->sink, item->u.sample))) WARN("Failed to report a sample, hr %#x.\n", hr); - stream_release_pending_item(stream, item); + stream_release_pending_item(item); item = stream_get_next_item(stream); if (item && item->type == ITEM_TYPE_SAMPLE) { @@ -718,7 +743,7 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba break; case ITEM_TYPE_MARKER: sample_grabber_stream_report_marker(stream, &item->u.marker.context, S_OK); - stream_release_pending_item(stream, item); + stream_release_pending_item(item); item = stream_get_next_item(stream); break; }

1 0

Alexandre Julliard : mciseq: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

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 : localui: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

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