October 2016 - Wine-commits

Stefan Dösinger : ddraw: Use the clip space matrix in TransformVertices.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 58b82c67513e31dbb581633633bca936e217f0f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b82c67513e31dbb58163363… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Oct 1 18:39:31 2016 +0100 ddraw: Use the clip space matrix in TransformVertices. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/viewport.c | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 393113e..6364c21 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -395,18 +395,20 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, { struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface); D3DVIEWPORT vp = viewport->viewports.vp1; - D3DMATRIX view_mat, world_mat, mat; + D3DMATRIX view_mat, world_mat, proj_mat, mat; struct transform_vertices_vertex *in, *out; float x, y, z, w; unsigned int i; D3DHVERTEX *outH; + struct d3d_device *device = viewport->active_device; + BOOL activate = device->current_viewport != viewport; TRACE("iface %p, vertex_count %u, data %p, flags %#x, offscreen %p.\n", iface, dwVertexCount, data, dwFlags, offscreen); /* Tests on windows show that Windows crashes when this occurs, * so don't return the (intuitive) return value - if (!viewport->active_device) + if (!device) { WARN("No device active, returning D3DERR_VIEWPORTHASNODEVICE\n"); return D3DERR_VIEWPORTHASNODEVICE; @@ -424,14 +426,18 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, return DDERR_INVALIDPARAMS; } - wined3d_mutex_lock(); - wined3d_device_get_transform(viewport->active_device->wined3d_device, + if (activate) + viewport_activate(viewport, TRUE); + + wined3d_device_get_transform(device->wined3d_device, D3DTRANSFORMSTATE_VIEW, (struct wined3d_matrix *)&view_mat); - wined3d_device_get_transform(viewport->active_device->wined3d_device, + wined3d_device_get_transform(device->wined3d_device, WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)&world_mat); + wined3d_device_get_transform(device->wined3d_device, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&proj_mat); multiply_matrix(&mat, &view_mat, &world_mat); - multiply_matrix(&mat, &viewport->active_device->legacy_projection, &mat); + multiply_matrix(&mat, &proj_mat, &mat); /* The pointer is not tested against NULL on Windows. */ if (dwFlags & D3DTRANSFORM_CLIPPED) @@ -453,22 +459,23 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, if(dwFlags & D3DTRANSFORM_CLIPPED) { /* If clipping is enabled, Windows assumes that outH is - * a valid pointer - */ - outH[i].u1.hx = x; outH[i].u2.hy = y; outH[i].u3.hz = z; + * a valid pointer. */ + outH[i].u1.hx = (x - device->legacy_clipspace._41 * w) / device->legacy_clipspace._11; + outH[i].u2.hy = (y - device->legacy_clipspace._42 * w) / device->legacy_clipspace._22; + outH[i].u3.hz = (z - device->legacy_clipspace._43 * w) / device->legacy_clipspace._33; outH[i].dwFlags = 0; - if(x * vp.dvScaleX > ((float) vp.dwWidth * 0.5)) + if (x > w) outH[i].dwFlags |= D3DCLIP_RIGHT; - if(x * vp.dvScaleX <= -((float) vp.dwWidth) * 0.5) + if (x < -w) outH[i].dwFlags |= D3DCLIP_LEFT; - if(y * vp.dvScaleY > ((float) vp.dwHeight * 0.5)) + if (y > w) outH[i].dwFlags |= D3DCLIP_TOP; - if(y * vp.dvScaleY <= -((float) vp.dwHeight) * 0.5) + if (y < -w) outH[i].dwFlags |= D3DCLIP_BOTTOM; - if(z < 0.0) + if (z < 0.0f) outH[i].dwFlags |= D3DCLIP_FRONT; - if(z > 1.0) + if (z > w) outH[i].dwFlags |= D3DCLIP_BACK; *offscreen &= outH[i].dwFlags; @@ -491,13 +498,16 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, w = 1 / w; x *= w; y *= w; z *= w; - out->x = vp.dwWidth / 2 + vp.dwX + x * vp.dvScaleX; - out->y = vp.dwHeight / 2 + vp.dwY - y * vp.dvScaleY; + out->x = (x + 1.0f) * vp.dwWidth * 0.5 + vp.dwX; + out->y = (-y + 1.0f) * vp.dwHeight * 0.5 + vp.dwY; out->z = z; out->w = w; out->payload = in->payload; } + if (activate && device->current_viewport) + viewport_activate(device->current_viewport, TRUE); + wined3d_mutex_unlock(); TRACE("All done\n");

1 0

Stefan Dösinger : ddraw/tests: Add D3DVIEWPORT2 transform tests.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: b44a5668f1304d182500059dbcb92ba3dba429c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b44a5668f1304d182500059db… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Oct 1 18:39:32 2016 +0100 ddraw/tests: Add D3DVIEWPORT2 transform tests. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 119 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 246 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b44a5668f1304d1825000…

1 0

Józef Kucia : wined3d: Use MAX_TEXTURES instead of magic number.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: a2ca4244bbc4d94ef91b11271453355479b8d0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ca4244bbc4d94ef91b11271… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 3 00:38:36 2016 +0200 wined3d: Use MAX_TEXTURES instead of magic number. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f809e4a..f8ecb80 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5934,8 +5934,8 @@ static void arbfp_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen /* TODO: Implement WINED3DTEXOPCAPS_PREMODULATE */ - caps->MaxTextureBlendStages = 8; - caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, 8); + caps->MaxTextureBlendStages = MAX_TEXTURES; + caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, MAX_TEXTURES); } static DWORD arbfp_get_emul_mask(const struct wined3d_gl_info *gl_info) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index cd32009..7a04f76 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1307,7 +1307,7 @@ static void atifs_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen * The proper fix for this is not to use GL_ATI_fragment_shader on cards newer than the * r200 series and use an ARB or GLSL shader instead */ - caps->MaxTextureBlendStages = 8; + caps->MaxTextureBlendStages = MAX_TEXTURES; caps->MaxSimultaneousTextures = 6; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b0f3224..55cbdcf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9433,8 +9433,8 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_gl_info *gl_info, s | WINED3DTEXOPCAPS_LERP | WINED3DTEXOPCAPS_BUMPENVMAP | WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE; - caps->MaxTextureBlendStages = 8; - caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, 8); + caps->MaxTextureBlendStages = MAX_TEXTURES; + caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, MAX_TEXTURES); } static DWORD glsl_fragment_pipe_get_emul_mask(const struct wined3d_gl_info *gl_info)

1 0

Józef Kucia : wined3d: Do not create separate dummy texture for each texture image unit.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: a4ce86c8f77e0824f5b8bebfe8d6b143ffac82ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ce86c8f77e0824f5b8bebfe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 3 00:38:37 2016 +0200 wined3d: Do not create separate dummy texture for each texture image unit. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 41 +++++------- dlls/wined3d/device.c | 144 ++++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 15 +++-- 3 files changed, 87 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4ce86c8f77e0824f5b8b…

1 0

Gerald Pfeifer : winedbg: Extend buffer in packet_query_monitor_process to avoid avoid overrun/ truncation.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: cf48fbcf362462969e463d123aa6e529be7f3eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf48fbcf362462969e463d123… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 2 07:40:36 2016 +0200 winedbg: Extend buffer in packet_query_monitor_process to avoid avoid overrun/truncation. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 7f0a8c9..f94fef5 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1710,7 +1710,7 @@ static void packet_query_monitor_wnd(struct gdb_context* gdbctx, int len, const static void packet_query_monitor_process(struct gdb_context* gdbctx, int len, const char* str) { HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); - char buffer[128]; + char buffer[31+MAX_PATH]; char deco; PROCESSENTRY32 entry; BOOL ok;

1 0

Gerald Pfeifer : wininet: Increase buffer in _test_status_code to avoid potential potential overflow.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 3cb027c7436d0299c5179fb1e19fa1416e0ca6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb027c7436d0299c5179fb1e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 2 12:15:40 2016 +0200 wininet: Increase buffer in _test_status_code to avoid potential potential overflow. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fc68fe1..f2fe25c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -200,7 +200,7 @@ static BOOL proxy_active(void) static void _test_status_code(unsigned line, HINTERNET req, DWORD excode, BOOL is_todo) { DWORD code, size, index; - char exbuf[10], bufa[10]; + char exbuf[12], bufa[10]; WCHAR bufw[10]; BOOL res;

1 0

André Hentschel : shell32/tests: Mark win10 failure as broken.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 410a9832d1c78c372deeb8544460ce4807495ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=410a9832d1c78c372deeb8544… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 2 14:48:55 2016 +0200 shell32/tests: Mark win10 failure as broken. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1591b7b..90418bd 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1588,7 +1588,8 @@ static void test_FolderShortcut(void) { if (hr != S_OK) return; hr = IShellFolder_GetDisplayNameOf(pShellFolder, NULL, SHGDN_FORPARSING, &strret); - ok(hr == S_OK, "IShellFolder_GetDisplayNameOf(NULL) failed! hr = %08x\n", hr); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* win10 */, + "IShellFolder_GetDisplayNameOf(NULL) failed! hr = %08x\n", hr); if (hr != S_OK) { IShellFolder_Release(pShellFolder); return;

1 0

Akihiro Sagawa : kernel32: Implement LCMAP_FULLWIDTH.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 85cff1717d0aeb66aa1f5d8f271ddc6a21d2e1dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=85cff1717d0aeb66aa1f5d8f2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Oct 3 00:06:55 2016 +0900 kernel32: Implement LCMAP_FULLWIDTH. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 195 +++++++++++++++++++++++++++++++++++++------ dlls/kernel32/tests/locale.c | 12 ++- 2 files changed, 179 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85cff1717d0aeb66aa1f5…

1 0

Sebastian Lackner : winebus.sys: Spawn a device loop thread and add synchronization.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 35d9d5f40a6e4ef82e13c5703349b33054c4daab URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d9d5f40a6e4ef82e13c5703… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 3 13:24:44 2016 +0200 winebus.sys: Spawn a device loop thread and add synchronization. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1525861..1f6df6f 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -164,8 +164,21 @@ static void build_initial_deviceset(void) udev_enumerate_unref(enumerate); } +static DWORD CALLBACK deviceloop_thread(void *args) +{ + HANDLE init_done = args; + + build_initial_deviceset(); + SetEvent(init_done); + + return 0; +} + NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) { + HANDLE events[2]; + DWORD result; + TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); if (!(udev_context = udev_new())) @@ -177,8 +190,29 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry udev_driver_obj = driver; driver->MajorFunction[IRP_MJ_PNP] = common_pnp_dispatch; - build_initial_deviceset(); - return STATUS_SUCCESS; + if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) + goto error; + if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, events[0], 0, NULL))) + { + CloseHandle(events[0]); + goto error; + } + + result = WaitForMultipleObjects(2, events, FALSE, INFINITE); + CloseHandle(events[0]); + CloseHandle(events[1]); + if (result == WAIT_OBJECT_0) + { + TRACE("Initialization successful\n"); + return STATUS_SUCCESS; + } + +error: + ERR("Failed to initialize udev device thread\n"); + udev_unref(udev_context); + udev_context = NULL; + udev_driver_obj = NULL; + return STATUS_UNSUCCESSFUL; } #else

1 0

Akihiro Sagawa : kernel32: Implement LCMAP_HALFWIDTH.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 429ca40fc89df38342a28047cf387ade9e2a05dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=429ca40fc89df38342a28047c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Oct 3 00:06:57 2016 +0900 kernel32: Implement LCMAP_HALFWIDTH. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 121 ++++++++++++++++++++++++++++++++++++++++++- dlls/kernel32/tests/locale.c | 10 ++-- 2 files changed, 126 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 92435c8..8c5736b 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3227,6 +3227,100 @@ static INT map_to_fullwidth( LPCWSTR src, INT srclen, LPWSTR dst ) return 1; } +/* decompose a full-width katakana character into one or two half-width characters. */ +static INT decompose_katakana( WCHAR c, LPWSTR dst, INT dstlen ) +{ + const static BYTE katakana_map[] = { + /* */ 0x9e, 0x9f, 0x9e, 0x9f, 0x00, 0x00, 0x00, /* U+3099- */ + 0x00, 0x67, 0x71, 0x68, 0x72, 0x69, 0x73, 0x6a, /* U+30a1- */ + 0x74, 0x6b, 0x75, 0x76, 0x01, 0x77, 0x01, 0x78, /* U+30a8- */ + 0x01, 0x79, 0x01, 0x7a, 0x01, 0x7b, 0x01, 0x7c, /* U+30b0- */ + 0x01, 0x7d, 0x01, 0x7e, 0x01, 0x7f, 0x01, 0x80, /* U+30b8- */ + 0x01, 0x81, 0x01, 0x6f, 0x82, 0x01, 0x83, 0x01, /* U+30c0- */ + 0x84, 0x01, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, /* U+30c8- */ + 0x01, 0x02, 0x8b, 0x01, 0x02, 0x8c, 0x01, 0x02, /* U+30d0- */ + 0x8d, 0x01, 0x02, 0x8e, 0x01, 0x02, 0x8f, 0x90, /* U+30d8- */ + 0x91, 0x92, 0x93, 0x6c, 0x94, 0x6d, 0x95, 0x6e, /* U+30e0- */ + 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x00, 0x9c, /* U+30e8- */ + 0x00, 0x00, 0x66, 0x9d, 0x4e, 0x00, 0x00, 0x08, /* U+30f0- */ + 0x58, 0x58, 0x08, 0x65, 0x70, 0x00, 0x51 /* U+30f8- */ + }; + INT len = 0, shift = c - 0x3099; + BYTE k; + + if (shift < 0 || shift >= sizeof(katakana_map)/sizeof(katakana_map[0])) + return 0; + + k = katakana_map[shift]; + + if (!k) + { + if (dstlen > 0) + *dst = c; + len++; + } + else if (k > 0x60) + { + if (dstlen > 0) + *dst = k | 0xff00; + len++; + } + else + { + if (dstlen >= 2) + { + dst[0] = (k > 0x50) ? (c - (k & 0xf)) : (katakana_map[shift - k] | 0xff00); + dst[1] = (k == 2) ? 0xff9f : 0xff9e; + } + len += 2; + } + return len; +} + +/* map single full-width character to single or double half-width characters. */ +static INT map_to_halfwidth(WCHAR c, LPWSTR dst, INT dstlen) +{ + INT n = decompose_katakana(c, dst, dstlen); + if (n > 0) + return n; + + if (c == 0x3000) + *dst = ' '; + else if (c == 0x3001) + *dst = 0xff64; + else if (c == 0x3002) + *dst = 0xff61; + else if (c == 0x300c || c == 0x300d) + *dst = (c - 0x300c) + 0xff62; + else if (c >= 0x3131 && c <= 0x3163) + { + *dst = c - 0x3131 + 0xffa1; + if (*dst >= 0xffbf) *dst += 3; + if (*dst >= 0xffc8) *dst += 2; + if (*dst >= 0xffd0) *dst += 2; + if (*dst >= 0xffd8) *dst += 2; + } + else if (c == 0x3164) + *dst = 0xffa0; + else if (c == 0x2019) + *dst = '\''; + else if (c == 0x201d) + *dst = '"'; + else if (c > 0xff00 && c < 0xff5f && c != 0xff3c) + *dst = c - 0xff00 + 0x20; + else if (c >= 0xffe0 && c <= 0xffe6) + { + const static WCHAR misc_symbol_map[] = { + 0x00a2, 0x00a3, 0x00ac, 0x00af, 0x00a6, 0x00a5, 0x20a9 + }; + *dst = misc_symbol_map[c - 0xffe0]; + } + else + *dst = c; + + return 1; +} + /************************************************************************* * LCMapStringEx (KERNEL32.@) * @@ -3310,7 +3404,7 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW } if (((flags & (NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS)) && (flags & ~(NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS))) || - ((flags & (LCMAP_HIRAGANA | LCMAP_KATAKANA | LCMAP_FULLWIDTH)) && + ((flags & (LCMAP_HIRAGANA | LCMAP_KATAKANA | LCMAP_HALFWIDTH | LCMAP_FULLWIDTH)) && (flags & (LCMAP_SIMPLIFIED_CHINESE | LCMAP_TRADITIONAL_CHINESE)))) { SetLastError(ERROR_INVALID_FLAGS); @@ -3349,6 +3443,12 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW } } } + else if (flags & LCMAP_HALFWIDTH) + { + for (len = 0; srclen; src++, srclen--, len++) + if (decompose_katakana(*src, NULL, 0) == 2) + len++; + } else len = srclen; return len; @@ -3407,7 +3507,24 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW wch == 0x30FD || wch == 0x30FE) wch -= 0x60; } - *dst_ptr = wch; + + if (flags & LCMAP_HALFWIDTH) + { + /* map full-width character to half-width one, + e.g. U+30A2 -> U+FF71, U+30D7 -> U+FF8C U+FF9F. */ + if (map_to_halfwidth(wch, dst_ptr, dstlen) == 2) + { + dstlen--; + dst_ptr++; + if (!dstlen) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + } + } + else + *dst_ptr = wch; } if (!(flags & (LCMAP_UPPERCASE | LCMAP_LOWERCASE))) goto done; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0f55de0..dd946a2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2218,6 +2218,10 @@ static const DWORD lcmap_invalid_flags[] = { LCMAP_FULLWIDTH | NORM_IGNORESYMBOLS, LCMAP_FULLWIDTH | LCMAP_SIMPLIFIED_CHINESE, LCMAP_FULLWIDTH | LCMAP_TRADITIONAL_CHINESE, + LCMAP_HALFWIDTH | NORM_IGNORENONSPACE, + LCMAP_HALFWIDTH | NORM_IGNORESYMBOLS, + LCMAP_HALFWIDTH | LCMAP_SIMPLIFIED_CHINESE, + LCMAP_HALFWIDTH | LCMAP_TRADITIONAL_CHINESE, }; static void test_LCMapStringA(void) @@ -2486,9 +2490,9 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f /* test LCMAP_HALFWIDTH */ ret = func_ptr(LCMAP_HALFWIDTH, japanese_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); - todo_wine ok(ret == lstrlenW(halfwidth_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, + ok(ret == lstrlenW(halfwidth_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name, ret, GetLastError(), lstrlenW(halfwidth_text) + 1); - todo_wine ok(!lstrcmpW(buf, halfwidth_text), "%s string compare mismatch\n", func_name); + ok(!lstrcmpW(buf, halfwidth_text), "%s string compare mismatch\n", func_name); ret2 = func_ptr(LCMAP_HALFWIDTH, japanese_text, -1, NULL, 0); ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret, ret2); @@ -2505,7 +2509,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f buf[0] = 0x30ac; SetLastError(0xdeadbeef); ret = func_ptr(LCMAP_HALFWIDTH, buf, 1, buf2, 1); - todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%s should return 0 and ERROR_INSUFFICIENT_BUFFER, got %d\n", func_name, ret); /* LCMAP_UPPERCASE or LCMAP_LOWERCASE should accept src == dst */

1 0