wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_queue_fbo_entry_destruction ().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 66aad5e95f5fdac9ec9b6287b5f1424576f46376 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66aad5e95f5fdac9ec9b6287… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 17 16:33:15 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_queue_fbo_entry_destruction(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 88ac2ee..bd30c14 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1038,27 +1038,27 @@ void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_s context_gl->free_pipeline_statistics_queries[context_gl->free_pipeline_statistics_query_count++] = query->u; } -typedef void (context_fbo_entry_func_t)(struct wined3d_context *context, struct fbo_entry *entry); +typedef void (context_fbo_entry_func_t)(struct wined3d_context_gl *context_gl, struct fbo_entry *entry); -static void context_enum_fbo_entries(const struct wined3d_device *device, +static void wined3d_context_gl_enum_fbo_entries(const struct wined3d_device *device, GLuint name, BOOL rb_namespace, context_fbo_entry_func_t *callback) { unsigned int i, j; for (i = 0; i < device->context_count; ++i) { - struct wined3d_context *context = device->contexts[i]; - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(device->contexts[i]); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct fbo_entry *entry, *entry2; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->c.fbo_list, struct fbo_entry, entry) { for (j = 0; j < gl_info->limits.buffers + 1; ++j) { if (entry->key.objects[j].object == name && !(entry->key.rb_namespace & (1 << j)) == !rb_namespace) { - callback(context, entry); + callback(context_gl, entry); break; } } @@ -1066,10 +1066,11 @@ static void context_enum_fbo_entries(const struct wined3d_device *device, } } -static void context_queue_fbo_entry_destruction(struct wined3d_context *context, struct fbo_entry *entry) +static void wined3d_context_gl_queue_fbo_entry_destruction(struct wined3d_context_gl *context_gl, + struct fbo_entry *entry) { list_remove(&entry->entry); - list_add_head(&context->fbo_destroy_list, &entry->entry); + list_add_head(&context_gl->c.fbo_destroy_list, &entry->entry); } void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) @@ -1091,10 +1092,10 @@ void context_resource_released(const struct wined3d_device *device, struct wined } } -void context_gl_resource_released(struct wined3d_device *device, - GLuint name, BOOL rb_namespace) +void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) { - context_enum_fbo_entries(device, name, rb_namespace, context_queue_fbo_entry_destruction); + wined3d_context_gl_enum_fbo_entries(device, name, rb_namespace, + wined3d_context_gl_queue_fbo_entry_destruction); } void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl,

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_state().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 2d20e498f1d38202275d4e2ce96450aacf998f76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d20e498f1d38202275d4e2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 17 16:33:14 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index aa4606e..88ac2ee 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -757,34 +757,33 @@ static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *contex } /* Context activation is done by the caller. */ -static void context_apply_fbo_state(struct wined3d_context *context, GLenum target, +static void wined3d_context_gl_apply_fbo_state(struct wined3d_context_gl *context_gl, GLenum target, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct fbo_entry *entry, *entry2; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->c.fbo_destroy_list, struct fbo_entry, entry) { wined3d_context_gl_destroy_fbo_entry(context_gl, entry); } - if (context->rebind_fbo) + if (context_gl->c.rebind_fbo) { wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); - context->rebind_fbo = FALSE; + context_gl->c.rebind_fbo = FALSE; } if (color_location == WINED3D_LOCATION_DRAWABLE) { - context->current_fbo = NULL; + context_gl->c.current_fbo = NULL; wined3d_context_gl_bind_fbo(context_gl, target, 0); } else { - context->current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, target, + context_gl->c.current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, target, render_targets, depth_stencil, color_location, ds_location); - wined3d_context_gl_apply_fbo_entry(context_gl, target, context->current_fbo); + wined3d_context_gl_apply_fbo_entry(context_gl, target, context_gl->c.current_fbo); } } @@ -810,7 +809,7 @@ void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_ ds_info.layer_count = 1; } - context_apply_fbo_state(&context_gl->c, target, context_gl->c.blit_targets, &ds_info, location, location); + wined3d_context_gl_apply_fbo_state(context_gl, target, context_gl->c.blit_targets, &ds_info, location, location); } /* Context activation is done by the caller. */ @@ -3060,13 +3059,13 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, ds_info.layer_count = dsv_gl->v.layer_count; } - context_apply_fbo_state(&context_gl->c, GL_FRAMEBUFFER, context_gl->c.blit_targets, &ds_info, + wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, context_gl->c.blit_targets, &ds_info, rt_count ? rts[0]->resource->draw_binding : 0, dsv ? dsv->resource->draw_binding : 0); } else { - context_apply_fbo_state(&context_gl->c, GL_FRAMEBUFFER, NULL, &ds_info, + wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, NULL, &ds_info, WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); rt_mask = context_generate_rt_mask_from_resource(rts[0]->resource); } @@ -3162,6 +3161,7 @@ static unsigned int find_draw_buffers_mask(const struct wined3d_context *context /* Context activation is done by the caller. */ void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int rt_mask = find_draw_buffers_mask(context, state); const struct wined3d_fb_state *fb = state->fb; DWORD color_location = 0; @@ -3173,7 +3173,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat if (!context->render_offscreen) { - context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, &ds_info, + wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, NULL, &ds_info, WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); } else @@ -3206,7 +3206,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat ds_info.layer_count = view_gl->v.layer_count; } - context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, &ds_info, + wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, context->blit_targets, &ds_info, color_location, fb->depth_stencil ? fb->depth_stencil->resource->draw_binding : 0); } }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_entry().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: f9224e72840200f2c0723f37c829bfbff3dab16d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9224e72840200f2c0723f37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 17 16:33:13 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7cd16d5..aa4606e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -704,10 +704,10 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex } /* Context activation is done by the caller. */ -static void context_apply_fbo_entry(struct wined3d_context *context, GLenum target, struct fbo_entry *entry) +static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *context_gl, + GLenum target, struct fbo_entry *entry) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLuint read_binding, draw_binding; unsigned int i; @@ -717,8 +717,8 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ return; } - read_binding = context->fbo_read_binding; - draw_binding = context->fbo_draw_binding; + read_binding = context_gl->c.fbo_read_binding; + draw_binding = context_gl->c.fbo_draw_binding; wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, entry->id); if (gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) @@ -734,11 +734,11 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) { - context_attach_surface_fbo(context, target, i, &entry->key.objects[i + 1], + context_attach_surface_fbo(&context_gl->c, target, i, &entry->key.objects[i + 1], entry->key.rb_namespace & (1 << (i + 1))); } - context_attach_depth_stencil_fbo(context, target, &entry->key.objects[0], + context_attach_depth_stencil_fbo(&context_gl->c, target, &entry->key.objects[0], entry->key.rb_namespace & 0x1, entry->flags); /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility @@ -784,7 +784,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ { context->current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, target, render_targets, depth_stencil, color_location, ds_location); - context_apply_fbo_entry(context, target, context->current_fbo); + wined3d_context_gl_apply_fbo_entry(context_gl, target, context->current_fbo); } }

1 0

Nikolay Sivov : kernelbase: Add some more string handling functions from shlwapi.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 9959e4144f57e39ab4a9475a9142620d10572621 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9959e4144f57e39ab4a9475a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 17 14:28:20 2019 +0300 kernelbase: Add some more string handling functions from shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 24 ++-- dlls/kernelbase/string.c | 302 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 314 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9959e4144f57e39ab4a9…

1 0

Nikolay Sivov : kernelbase: Add LoadString() exports.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 44a6b495777fb471686144b474e7485d4927b104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44a6b495777fb471686144b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 17 14:28:19 2019 +0300 kernelbase: Add LoadString() exports. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 4 +-- dlls/kernelbase/string.c | 80 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 0ecc029..02278fe 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -929,10 +929,10 @@ @ stdcall LoadLibraryW(wstr) kernel32.LoadLibraryW # @ stub LoadPackagedLibrary @ stdcall LoadResource(long long) kernel32.LoadResource -@ stdcall LoadStringA(long long ptr long) user32.LoadStringA +@ stdcall LoadStringA(long long ptr long) @ stub LoadStringBaseExW @ stub LoadStringByReference -@ stdcall LoadStringW(long long ptr long) user32.LoadStringW +@ stdcall LoadStringW(long long ptr long) @ stdcall LocalAlloc(long long) kernel32.LocalAlloc @ stdcall LocalFileTimeToFileTime(ptr ptr) kernel32.LocalFileTimeToFileTime @ stdcall LocalFree(long) kernel32.LocalFree diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 3d2766a..fb7bda8 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -22,6 +22,7 @@ #include "winbase.h" #include "winnls.h" #include "shlwapi.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/exception.h" @@ -738,3 +739,82 @@ LPWSTR WINAPI CharUpperW(WCHAR *str) return (LPWSTR)(UINT_PTR)ch; } } + +INT WINAPI DECLSPEC_HOTPATCH LoadStringW(HINSTANCE instance, UINT resource_id, LPWSTR buffer, INT buflen) +{ + int string_num, i; + HGLOBAL hmem; + HRSRC hrsrc; + WCHAR *p; + + TRACE("instance = %p, id = %04x, buffer = %p, length = %d\n", instance, resource_id, buffer, buflen); + + if (!buffer) + return 0; + + /* Use loword (incremented by 1) as resourceid */ + hrsrc = FindResourceW(instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING); + if (!hrsrc) return 0; + hmem = LoadResource(instance, hrsrc); + if (!hmem) return 0; + + p = LockResource(hmem); + string_num = resource_id & 0x000f; + for (i = 0; i < string_num; i++) + p += *p + 1; + + TRACE("strlen = %d\n", (int)*p ); + + /*if buflen == 0, then return a read-only pointer to the resource itself in buffer + it is assumed that buffer is actually a (LPWSTR *) */ + if (buflen == 0) + { + *((LPWSTR *)buffer) = p + 1; + return *p; + } + + i = min(buflen - 1, *p); + if (i > 0) + { + memcpy(buffer, p + 1, i * sizeof (WCHAR)); + buffer[i] = 0; + } + else + { + if (buflen > 1) + { + buffer[0] = 0; + return 0; + } + } + + TRACE("returning %s\n", debugstr_w(buffer)); + return i; +} + +INT WINAPI DECLSPEC_HOTPATCH LoadStringA(HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen) +{ + DWORD retval = 0; + HGLOBAL hmem; + HRSRC hrsrc; + + TRACE("instance = %p, id = %04x, buffer = %p, length = %d\n", instance, resource_id, buffer, buflen); + + if (!buflen) return -1; + + /* Use loword (incremented by 1) as resourceid */ + if ((hrsrc = FindResourceW(instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING )) && + (hmem = LoadResource(instance, hrsrc))) + { + const WCHAR *p = LockResource(hmem); + unsigned int id = resource_id & 0x000f; + + while (id--) p += *p + 1; + + if (buflen != 1) + RtlUnicodeToMultiByteN(buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR)); + } + buffer[retval] = 0; + TRACE("returning %s\n", debugstr_a(buffer)); + return retval; +}

1 0

Nikolay Sivov : kernelbase: Add string handling functions from user32.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 40d2b25ac23f2c60c314380d6da554bde82e0cae URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d2b25ac23f2c60c314380d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 17 14:28:18 2019 +0300 kernelbase: Add string handling functions from user32. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 44 ++++---- dlls/kernelbase/string.c | 226 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 248 insertions(+), 22 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9739644..0ecc029 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -109,20 +109,20 @@ @ stdcall CancelWaitableTimer(long) kernel32.CancelWaitableTimer # @ stub CeipIsOptedIn @ stdcall ChangeTimerQueueTimer(ptr ptr long long) kernel32.ChangeTimerQueueTimer -@ stdcall CharLowerA(str) user32.CharLowerA -@ stdcall CharLowerBuffA(str long) user32.CharLowerBuffA -@ stdcall CharLowerBuffW(wstr long) user32.CharLowerBuffW -@ stdcall CharLowerW(wstr) user32.CharLowerW -@ stdcall CharNextA(str) user32.CharNextA -@ stdcall CharNextExA(long str long) user32.CharNextExA -@ stdcall CharNextW(wstr) user32.CharNextW -@ stdcall CharPrevA(str str) user32.CharPrevA -@ stdcall CharPrevExA(long str str long) user32.CharPrevExA -@ stdcall CharPrevW(wstr wstr) user32.CharPrevW -@ stdcall CharUpperA(str) user32.CharUpperA -@ stdcall CharUpperBuffA(str long) user32.CharUpperBuffA -@ stdcall CharUpperBuffW(wstr long) user32.CharUpperBuffW -@ stdcall CharUpperW(wstr) user32.CharUpperW +@ stdcall CharLowerA(str) +@ stdcall CharLowerBuffA(str long) +@ stdcall CharLowerBuffW(wstr long) +@ stdcall CharLowerW(wstr) +@ stdcall CharNextA(str) +@ stdcall CharNextExA(long str long) +@ stdcall CharNextW(wstr) +@ stdcall CharPrevA(str str) +@ stdcall CharPrevExA(long str str long) +@ stdcall CharPrevW(wstr wstr) +@ stdcall CharUpperA(str) +@ stdcall CharUpperBuffA(str long) +@ stdcall CharUpperBuffW(wstr long) +@ stdcall CharUpperW(wstr) # @ stub CheckAllowDecryptedRemoteDestinationPolicy @ stub CheckGroupPolicyEnabled # @ stub CheckIfStateChangeNotificationExists @@ -839,20 +839,20 @@ # @ stub InternetTimeToSystemTimeW # @ stub InvalidateAppModelVersionCache @ stub InvalidateTzSpecificCache -@ stdcall IsCharAlphaA(long) user32.IsCharAlphaA -@ stdcall IsCharAlphaNumericA(long) user32.IsCharAlphaNumericA -@ stdcall IsCharAlphaNumericW(long) user32.IsCharAlphaNumericW -@ stdcall IsCharAlphaW(long) user32.IsCharAlphaW +@ stdcall IsCharAlphaA(long) +@ stdcall IsCharAlphaNumericA(long) +@ stdcall IsCharAlphaNumericW(long) +@ stdcall IsCharAlphaW(long) @ stdcall IsCharBlankW(long) @ stdcall IsCharCntrlW(long) @ stdcall IsCharDigitW(long) -@ stdcall IsCharLowerA(long) user32.IsCharLowerA -@ stdcall IsCharLowerW(long) user32.IsCharLowerW +@ stdcall IsCharLowerA(long) +@ stdcall IsCharLowerW(long) @ stdcall IsCharPunctW(long) @ stdcall IsCharSpaceA(long) @ stdcall IsCharSpaceW(long) -@ stdcall IsCharUpperA(long) user32.IsCharUpperA -@ stdcall IsCharUpperW(long) user32.IsCharUpperW +@ stdcall IsCharUpperA(long) +@ stdcall IsCharUpperW(long) @ stdcall IsCharXDigitW(long) @ stdcall IsDBCSLeadByte(long) kernel32.IsDBCSLeadByte @ stdcall IsDBCSLeadByteEx(long long) kernel32.IsDBCSLeadByteEx diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 6f38fc3..3d2766a 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -24,6 +24,7 @@ #include "shlwapi.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(string); @@ -101,6 +102,54 @@ BOOL WINAPI IsCharXDigitW(WCHAR wc) return !!(get_char_type(wc) & C1_XDIGIT); } +BOOL WINAPI IsCharAlphaA(CHAR x) +{ + WCHAR wch; + MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); + return IsCharAlphaW(wch); +} + +BOOL WINAPI IsCharAlphaW(WCHAR ch) +{ + return !!(get_char_type(ch) & C1_ALPHA); +} + +BOOL WINAPI IsCharLowerA(CHAR x) +{ + WCHAR wch; + MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); + return IsCharLowerW(wch); +} + +BOOL WINAPI IsCharLowerW(WCHAR ch) +{ + return !!(get_char_type(ch) & C1_LOWER); +} + +BOOL WINAPI IsCharAlphaNumericA(CHAR x) +{ + WCHAR wch; + MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); + return IsCharAlphaNumericW(wch); +} + +BOOL WINAPI IsCharAlphaNumericW(WCHAR ch) +{ + return !!(get_char_type(ch) & (C1_ALPHA | C1_DIGIT)); +} + +BOOL WINAPI IsCharUpperA(CHAR x) +{ + WCHAR wch; + MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); + return IsCharUpperW(wch); +} + +BOOL WINAPI IsCharUpperW(WCHAR ch) +{ + return !!(get_char_type(ch) & C1_UPPER); +} + WCHAR * WINAPI StrChrW(const WCHAR *str, WCHAR ch) { TRACE("%s, %#x\n", wine_dbgstr_w(str), ch); @@ -512,3 +561,180 @@ WCHAR * WINAPI StrCpyNXW(WCHAR *dst, const WCHAR *src, int len) return dst; } + +LPSTR WINAPI CharLowerA(char *str) +{ + if (IS_INTRESOURCE(str)) + { + char ch = LOWORD(str); + CharLowerBuffA( &ch, 1 ); + return (LPSTR)(UINT_PTR)(BYTE)ch; + } + + __TRY + { + CharLowerBuffA( str, strlen(str) ); + } + __EXCEPT_PAGE_FAULT + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + __ENDTRY + return str; +} + +DWORD WINAPI CharLowerBuffA(char *str, DWORD len) +{ + DWORD lenW; + WCHAR buffer[32]; + WCHAR *strW = buffer; + + if (!str) return 0; /* YES */ + + lenW = MultiByteToWideChar(CP_ACP, 0, str, len, NULL, 0); + if (lenW > ARRAY_SIZE(buffer)) + { + strW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); + if (!strW) return 0; + } + MultiByteToWideChar(CP_ACP, 0, str, len, strW, lenW); + CharLowerBuffW(strW, lenW); + len = WideCharToMultiByte(CP_ACP, 0, strW, lenW, str, len, NULL, NULL); + if (strW != buffer) HeapFree(GetProcessHeap(), 0, strW); + return len; +} + +DWORD WINAPI CharLowerBuffW(WCHAR *str, DWORD len) +{ + if (!str) return 0; /* YES */ + return LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, str, len, str, len); +} + +LPWSTR WINAPI CharLowerW(WCHAR *str) +{ + if (!IS_INTRESOURCE(str)) + { + CharLowerBuffW(str, lstrlenW(str)); + return str; + } + else + { + WCHAR ch = LOWORD(str); + CharLowerBuffW(&ch, 1); + return (LPWSTR)(UINT_PTR)ch; + } +} + +LPSTR WINAPI CharNextA(const char *ptr) +{ + if (!*ptr) return (LPSTR)ptr; + if (IsDBCSLeadByte( ptr[0] ) && ptr[1]) return (LPSTR)(ptr + 2); + return (LPSTR)(ptr + 1); +} + +LPSTR WINAPI CharNextExA(WORD codepage, const char *ptr, DWORD flags) +{ + if (!*ptr) return (LPSTR)ptr; + if (IsDBCSLeadByteEx( codepage, ptr[0] ) && ptr[1]) return (LPSTR)(ptr + 2); + return (LPSTR)(ptr + 1); +} + +LPWSTR WINAPI CharNextW(const WCHAR *x) +{ + if (*x) x++; + + return (WCHAR *)x; +} + +LPSTR WINAPI CharPrevA(const char *start, const char *ptr) +{ + while (*start && (start < ptr)) + { + LPCSTR next = CharNextA(start); + if (next >= ptr) break; + start = next; + } + return (LPSTR)start; +} + +LPSTR WINAPI CharPrevExA(WORD codepage, const char *start, const char *ptr, DWORD flags) +{ + while (*start && (start < ptr)) + { + LPCSTR next = CharNextExA(codepage, start, flags); + if (next >= ptr) break; + start = next; + } + return (LPSTR)start; +} + +LPWSTR WINAPI CharPrevW(const WCHAR *start, const WCHAR *x) +{ + if (x > start) return (LPWSTR)(x - 1); + else return (LPWSTR)x; +} + +LPSTR WINAPI CharUpperA(LPSTR str) +{ + if (IS_INTRESOURCE(str)) + { + char ch = LOWORD(str); + CharUpperBuffA(&ch, 1); + return (LPSTR)(UINT_PTR)(BYTE)ch; + } + + __TRY + { + CharUpperBuffA(str, strlen(str)); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + __ENDTRY + return str; +} + +DWORD WINAPI CharUpperBuffA(LPSTR str, DWORD len) +{ + DWORD lenW; + WCHAR buffer[32]; + WCHAR *strW = buffer; + + if (!str) return 0; /* YES */ + + lenW = MultiByteToWideChar(CP_ACP, 0, str, len, NULL, 0); + if (lenW > ARRAY_SIZE(buffer)) + { + strW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); + if (!strW) return 0; + } + MultiByteToWideChar(CP_ACP, 0, str, len, strW, lenW); + CharUpperBuffW(strW, lenW); + len = WideCharToMultiByte(CP_ACP, 0, strW, lenW, str, len, NULL, NULL); + if (strW != buffer) HeapFree(GetProcessHeap(), 0, strW); + return len; +} + +DWORD WINAPI CharUpperBuffW(WCHAR *str, DWORD len) +{ + if (!str) return 0; /* YES */ + return LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_UPPERCASE, str, len, str, len); +} + +LPWSTR WINAPI CharUpperW(WCHAR *str) +{ + if (!IS_INTRESOURCE(str)) + { + CharUpperBuffW(str, lstrlenW(str)); + return str; + } + else + { + WCHAR ch = LOWORD(str); + CharUpperBuffW(&ch, 1); + return (LPWSTR)(UINT_PTR)ch; + } +}

1 0

Nikolay Sivov : kernelbase: Use a helper to get character C1 type.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 3dedcf82f7b073eebbcac66d56d3503e5937999c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dedcf82f7b073eebbcac66d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 17 14:28:17 2019 +0300 kernelbase: Use a helper to get character C1 type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/string.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 4991ba3..6f38fc3 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -28,6 +28,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(string); +static WORD get_char_type(WCHAR ch) +{ + WORD type = 0; + GetStringTypeW(CT_CTYPE1, &ch, 1, &type); + return type; +} + DWORD WINAPI StrCmpCA(const char *str, const char *cmp) { return lstrcmpA(str, cmp); @@ -60,30 +67,22 @@ DWORD WINAPI StrCmpNICW(const WCHAR *str, const WCHAR *cmp, DWORD len) BOOL WINAPI IsCharBlankW(WCHAR wc) { - WORD type; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_BLANK); + return !!(get_char_type(wc) & C1_BLANK); } BOOL WINAPI IsCharCntrlW(WCHAR wc) { - WORD type; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_CNTRL); + return !!(get_char_type(wc) & C1_CNTRL); } BOOL WINAPI IsCharDigitW(WCHAR wc) { - WORD type; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_DIGIT); + return !!(get_char_type(wc) & C1_DIGIT); } BOOL WINAPI IsCharPunctW(WCHAR wc) { - WORD type; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_PUNCT); + return !!(get_char_type(wc) & C1_PUNCT); } BOOL WINAPI IsCharSpaceA(CHAR c) @@ -94,16 +93,12 @@ BOOL WINAPI IsCharSpaceA(CHAR c) BOOL WINAPI IsCharSpaceW(WCHAR wc) { - WORD type; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_SPACE); + return !!(get_char_type(wc) & C1_SPACE); } BOOL WINAPI IsCharXDigitW(WCHAR wc) { - WORD type; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_XDIGIT); + return !!(get_char_type(wc) & C1_XDIGIT); } WCHAR * WINAPI StrChrW(const WCHAR *str, WCHAR ch)

1 0

Andreas Maier : jscript/tests: Add more Enumerator tests.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: f010569c3d8e84b9c38e768c7e3e3c834688807d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f010569c3d8e84b9c38e768c… Author: Andreas Maier <staubim(a)quantentunnel.de> Date: Fri May 17 16:39:32 2019 +0200 jscript/tests: Add more Enumerator tests. Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/api.js | 15 ++++ dlls/jscript/tests/run.c | 169 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 183 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 40d6422..40a1b2d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2452,6 +2452,7 @@ var exception_array = { E_OBJECT_EXPECTED: { type: "TypeError", number: -2146823281 }, E_OBJECT_REQUIRED: { type: "TypeError", number: -2146827864 }, E_UNSUPPORTED_ACTION: { type: "TypeError", number: -2146827843 }, + E_NOT_ENUMERATOR: { type: "TypeError", number: -2146823273 }, E_NOT_VBARRAY: { type: "TypeError", number: -2146823275 }, E_INVALID_DELETE: { type: "TypeError", number: -2146823276 }, E_UNDEFINED: { type: "TypeError", number: -2146823279 }, @@ -2717,6 +2718,15 @@ testArrayHostThis("join"); testArrayHostThis("pop"); testArrayHostThis("sort"); +function testEnumeratorThis(func) { + testThisExcept(Enumerator.prototype[func], "E_NOT_ENUMERATOR"); +} + +testEnumeratorThis("atEnd"); +testEnumeratorThis("item"); +testEnumeratorThis("moveFirst"); +testEnumeratorThis("moveNext"); + function testObjectInherit(obj, constr, ts, tls, vo) { ok(obj instanceof Object, "obj is not instance of Object"); ok(obj instanceof constr, "obj is not instance of its constructor"); @@ -3009,4 +3019,9 @@ ok(tmp.toArray() == "2,3,12,13,22,23,32,33,42,43", "tmp.toArray() = " + tmp.toAr ok(createArray().toArray() == "2,3,12,13,22,23,32,33,42,43", "createArray.toArray()=" + createArray().toArray()); +obj = new Enumerator(); +ok(obj.atEnd(), "atEnd() = " + obj.atEnd()); +obj.moveFirst(); +ok(obj.atEnd(), "atEnd() = " + obj.atEnd()); + reportSuccess(); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index aadb317..c8a143b 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -106,6 +106,10 @@ DEFINE_EXPECT(testobj_noprop_d); DEFINE_EXPECT(testobj_onlydispid_d); DEFINE_EXPECT(testobj_onlydispid_i); DEFINE_EXPECT(testobj_notexists_d); +DEFINE_EXPECT(testobj_newenum); +DEFINE_EXPECT(enumvariant_next_0); +DEFINE_EXPECT(enumvariant_next_1); +DEFINE_EXPECT(enumvariant_reset); DEFINE_EXPECT(GetItemInfo_testVal); DEFINE_EXPECT(ActiveScriptSite_OnScriptError); DEFINE_EXPECT(invoke_func); @@ -144,6 +148,7 @@ DEFINE_EXPECT(BindHandler); #define DISPID_GLOBAL_TESTPROPPUTREF 0x101b #define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c #define DISPID_GLOBAL_BINDEVENTHANDLER 0x101d +#define DISPID_GLOBAL_TESTENUMOBJ 0x101e #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -219,6 +224,101 @@ static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) ok_(__FILE__,line)(grfdex == expect, "grfdex = %x, expected %x\n", grfdex, expect); } +static HRESULT WINAPI EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualGUID(riid, &IID_IEnumVARIANT)) + *ppv = iface; + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI EnumVARIANT_AddRef(IEnumVARIANT *iface) +{ + return 2; +} + +static ULONG WINAPI EnumVARIANT_Release(IEnumVARIANT *iface) +{ + return 1; +} + +static int EnumVARIANT_index = 0; +static int EnumVARIANT_next_0_count = 0; +static HRESULT WINAPI EnumVARIANT_Next( + IEnumVARIANT *This, + ULONG celt, + VARIANT *rgVar, + ULONG *pCeltFetched) +{ + ok(rgVar != NULL, "rgVar is NULL\n"); + ok(celt == 1, "celt = %d\n", celt); + ok(pCeltFetched == NULL, "pCeltFetched is not NULL\n"); + + if (!rgVar) + return S_FALSE; + + if (EnumVARIANT_index == 0) + { + EnumVARIANT_next_0_count--; + if (EnumVARIANT_next_0_count <= 0) + CHECK_EXPECT(enumvariant_next_0); + + V_VT(rgVar) = VT_I4; + V_I4(rgVar) = 123; + + if (pCeltFetched) + *pCeltFetched = 1; + EnumVARIANT_index++; + return S_OK; + } + + CHECK_EXPECT(enumvariant_next_1); + + if (pCeltFetched) + *pCeltFetched = 0; + return S_FALSE; + +} + +static HRESULT WINAPI EnumVARIANT_Skip( + IEnumVARIANT *This, + ULONG celt) +{ + ok(0, "EnumVariant_Skip: unexpected call\n"); + return E_NOTIMPL; +} +static HRESULT WINAPI EnumVARIANT_Reset( + IEnumVARIANT *This) +{ + CHECK_EXPECT(enumvariant_reset); + EnumVARIANT_index = 0; + return S_OK; +} + +static HRESULT WINAPI EnumVARIANT_Clone( + IEnumVARIANT *This, + IEnumVARIANT **ppEnum) +{ + ok(0, "EnumVariant_Clone: unexpected call\n"); + return E_NOTIMPL; +} + +static IEnumVARIANTVtbl testEnumVARIANTVtbl = { + EnumVARIANT_QueryInterface, + EnumVARIANT_AddRef, + EnumVARIANT_Release, + EnumVARIANT_Next, + EnumVARIANT_Skip, + EnumVARIANT_Reset, + EnumVARIANT_Clone +}; + +static IEnumVARIANT testEnumVARIANT = { &testEnumVARIANTVtbl }; + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -320,6 +420,28 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown return E_NOTIMPL; } +static HRESULT WINAPI testObj_Invoke(IDispatchEx *iface, DISPID id, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, UINT *puArgErr) +{ + switch(id) { + case DISPID_NEWENUM: + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei == NULL, "pei != NULL\n"); + + CHECK_EXPECT(testobj_newenum); + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&testEnumVARIANT; + return S_OK; + } + + ok(0, "unexpected call %x\n", id); + return DISP_E_MEMBERNOTFOUND; +} + static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!strcmp_wa(bstrName, "prop")) { @@ -453,7 +575,7 @@ static IDispatchExVtbl testObjVtbl = { DispatchEx_GetTypeInfoCount, DispatchEx_GetTypeInfo, DispatchEx_GetIDsOfNames, - DispatchEx_Invoke, + testObj_Invoke, testObj_GetDispID, testObj_InvokeEx, testObj_DeleteMemberByName, @@ -861,6 +983,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "testEnumObj")) { + *pid = DISPID_GLOBAL_TESTENUMOBJ; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -2682,6 +2809,46 @@ static BOOL run_tests(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + EnumVARIANT_index = 0; + EnumVARIANT_next_0_count = 1; + SET_EXPECT(testobj_newenum); + SET_EXPECT(enumvariant_next_0); + parse_script_a("new Enumerator(testObj);"); + CHECK_CALLED(testobj_newenum); + CHECK_CALLED(enumvariant_next_0); + + EnumVARIANT_index = 0; + EnumVARIANT_next_0_count = 2; + SET_EXPECT(testobj_newenum); + SET_EXPECT(enumvariant_next_0); + SET_EXPECT(enumvariant_reset); + parse_script_a("(function () {" + " var testEnumObj = new Enumerator(testObj);" + " var tmp = testEnumObj.moveFirst();" + " ok(tmp == undefined, \"testEnumObj.moveFirst() = \" + tmp);" + "})()"); + CHECK_CALLED(testobj_newenum); + CHECK_CALLED(enumvariant_next_0); + CHECK_CALLED(enumvariant_reset); + + EnumVARIANT_index = 0; + EnumVARIANT_next_0_count = 1; + SET_EXPECT(testobj_newenum); + SET_EXPECT(enumvariant_next_0); + SET_EXPECT(enumvariant_next_1); + parse_script_a("(function () {" + " var testEnumObj = new Enumerator(testObj);" + " while (!testEnumObj.atEnd())" + " {" + " ok(testEnumObj.item() == 123, " + " \"testEnumObj.item() = \"+testEnumObj.item());" + " testEnumObj.moveNext();" + " }" + "})()"); + CHECK_CALLED(testobj_newenum); + CHECK_CALLED(enumvariant_next_0); + CHECK_CALLED(enumvariant_next_1); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Andreas Maier : jscript: Implement Enumerator object.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: a015c626438dc8cba445242c68d4175f381b2128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a015c626438dc8cba445242c… Author: Andreas Maier <staubim(a)quantentunnel.de> Date: Fri May 17 16:26:36 2019 +0200 jscript: Implement Enumerator object. Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/enumerator.c | 262 +++++++++++++++++++++++++++++++++++++--------- dlls/jscript/jscript.h | 3 +- dlls/jscript/object.c | 2 +- dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 6 +- 5 files changed, 217 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a015c626438dc8cba445…

1 0

Nikolay Sivov : mf: Slightly improve topoloader Load().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 73fae7aa5b579ae82071509a182628bf6901b096 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73fae7aa5b579ae82071509a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 17 15:35:23 2019 +0300 mf: Slightly improve topoloader Load(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/Makefile.in | 4 +- dlls/mf/tests/mf.c | 269 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/resource.rc | 22 ++++ dlls/mf/tests/test.wav | Bin 0 -> 4488 bytes dlls/mf/topology.c | 44 +++++++- include/mfidl.idl | 7 ++ 6 files changed, 344 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73fae7aa5b579ae82071…

1 0

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 May 2019