April 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d8/tests: Add a test for partial depth buffer copies.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 826c91c5e0e3ee7804eb3e207e28278c98369afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=826c91c5e0e3ee7804eb3e207… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 17:46:03 2011 +0200 d3d8/tests: Add a test for partial depth buffer copies. --- dlls/d3d8/tests/visual.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a6a9c9b..08928d5 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1556,6 +1556,106 @@ static void depth_buffer_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); } +/* Test that partial depth copies work the way they're supposed to. The clear + * on rt2 only needs a partial copy of the onscreen depth/stencil buffer, and + * the following draw should only copy back the part that was modified. */ +static void depth_buffer2_test(IDirect3DDevice8 *device) +{ + static const struct vertex quad[] = + { + { -1.0, 1.0, 0.66f, 0xffff0000}, + { 1.0, 1.0, 0.66f, 0xffff0000}, + { -1.0, -1.0, 0.66f, 0xffff0000}, + { 1.0, -1.0, 0.66f, 0xffff0000}, + }; + + IDirect3DSurface8 *backbuffer, *rt1, *rt2; + IDirect3DSurface8 *depth_stencil; + unsigned int i, j; + D3DVIEWPORT8 vp; + D3DCOLOR color; + HRESULT hr; + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + + hr = IDirect3DDevice8_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, FALSE, &rt1); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateRenderTarget(device, 480, 360, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, FALSE, &rt2); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &depth_stencil); + ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderTarget(device, &backbuffer); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt1, depth_stencil); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depth_stencil); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 0.5f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt2, depth_stencil); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depth_stencil); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + IDirect3DSurface8_Release(depth_stencil); + IDirect3DSurface8_Release(backbuffer); + IDirect3DSurface8_Release(rt2); + IDirect3DSurface8_Release(rt1); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + unsigned int x = 80 * ((2 * j) + 1); + unsigned int y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 0), + "Expected color 0x0000ff00 %u,%u, got 0x%08x.\n", x, y, color); + } + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); +} + static void intz_test(IDirect3DDevice8 *device) { static const DWORD ps_code[] = @@ -2033,6 +2133,7 @@ START_TEST(visual) p8_texture_test(device_ptr); texop_test(device_ptr); depth_buffer_test(device_ptr); + depth_buffer2_test(device_ptr); intz_test(device_ptr); shadow_test(device_ptr);

1 0

Henri Verbeet : wined3d: Fix partial depth buffer copies.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 032f8702edc769ba42e23034ef9dcc3854efd928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=032f8702edc769ba42e23034e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 17:46:02 2011 +0200 wined3d: Fix partial depth buffer copies. Don't overwrite the entire buffer if only part of it is not current. The data we're copying may not be completely current either. This is for the case where the inner rect is not current and the outer edge is. The reverse case where the inner rect is current and we need to mask already works correctly. --- dlls/wined3d/surface.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 59f5aa7..bbbdd49 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4126,10 +4126,10 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, const struct wined3d_gl glDepthFunc(GL_ALWAYS); glDepthMask(GL_TRUE); glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); - glViewport(0, 0, w, h); + glViewport(0, This->pow2Height - h, w, h); SetRect(&rect, 0, h, w, 0); - surface_get_blt_info(target, &rect, w, h, &info); + surface_get_blt_info(target, &rect, This->pow2Width, This->pow2Height, &info); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); glGetIntegerv(info.binding, &old_binding); glBindTexture(info.bind_target, texture); @@ -4180,6 +4180,7 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte { IWineD3DDeviceImpl *device = surface->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; + GLsizei w, h; TRACE("surface %p, new location %#x.\n", surface, location); @@ -4188,9 +4189,16 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte if (!(surface->flags & location)) { + w = surface->ds_current_size.cx; + h = surface->ds_current_size.cy; surface->ds_current_size.cx = 0; surface->ds_current_size.cy = 0; } + else + { + w = surface->resource.width; + h = surface->resource.height; + } if (surface->ds_current_size.cx == surface->resource.width && surface->ds_current_size.cy == surface->resource.height) @@ -4216,14 +4224,13 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte { GLint old_binding = 0; GLenum bind_target; - GLsizei w, h; /* The render target is allowed to be smaller than the depth/stencil * buffer, so the onscreen depth/stencil buffer is potentially smaller * than the offscreen surface. Don't overwrite the offscreen surface * with undefined data. */ - w = min(surface->resource.width, context->swapchain->presentParms.BackBufferWidth); - h = min(surface->resource.height, context->swapchain->presentParms.BackBufferHeight); + w = min(w, context->swapchain->presentParms.BackBufferWidth); + h = min(h, context->swapchain->presentParms.BackBufferHeight); TRACE("Copying onscreen depth buffer to depth texture.\n"); @@ -4298,7 +4305,7 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte context_bind_fbo(context, GL_FRAMEBUFFER, NULL); surface_depth_blt(surface, gl_info, surface->texture_name, - surface->resource.width, surface->resource.height, surface->texture_target); + w, h, surface->texture_target); checkGLcall("depth_blt"); if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id);

1 0

Akihiro Sagawa : kernel32/tests: Add a test for undefined byte character conversion.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 79d7cd76f9bcfb8885d0dd4a3760afa767380ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d7cd76f9bcfb8885d0dd4a3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 4 19:00:58 2011 +0900 kernel32/tests: Add a test for undefined byte character conversion. --- dlls/kernel32/tests/codepage.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 402e4bf..96dd45d 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -354,6 +354,57 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); } +static void test_undefined_byte_char(void) +{ + struct tag_testset { + INT codepage; + LPCSTR str; + BOOL is_error; + } testset[] = { + { 874, "\xdd", TRUE }, + { 932, "\xfe", TRUE }, + { 932, "\x80", FALSE }, + { 936, "\xff", TRUE }, + { 949, "\xff", TRUE }, + { 950, "\xff", TRUE }, + { 1252, "\x90", FALSE }, + { 1253, "\xaa", TRUE }, + { 1255, "\xff", TRUE }, + { 1257, "\xa5", TRUE }, + }; + INT i, ret; + + for (i = 0; i < (sizeof(testset) / sizeof(testset[0])); i++) { + if (! IsValidCodePage(testset[i].codepage)) + { + skip("Codepage %d not available\n", testset[i].codepage); + continue; + } + + SetLastError(0xdeadbeef); + ret = MultiByteToWideChar(testset[i].codepage, MB_ERR_INVALID_CHARS, + testset[i].str, -1, NULL, 0); + if (testset[i].is_error) { + todo_wine + ok(ret == 0 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION, + "ret is %d, GetLastError is %u (cp %d)\n", + ret, GetLastError(), testset[i].codepage); + } + else { + ok(ret == strlen(testset[i].str)+1 && GetLastError() == 0xdeadbeef, + "ret is %d, GetLastError is %u (cp %d)\n", + ret, GetLastError(), testset[i].codepage); + } + + SetLastError(0xdeadbeef); + ret = MultiByteToWideChar(testset[i].codepage, 0, + testset[i].str, -1, NULL, 0); + ok(ret == strlen(testset[i].str)+1 && GetLastError() == 0xdeadbeef, + "ret is %d, GetLastError is %u (cp %d)\n", + ret, GetLastError(), testset[i].codepage); + } +} + START_TEST(codepage) { BOOL bUsedDefaultChar; @@ -367,4 +418,6 @@ START_TEST(codepage) /* WideCharToMultiByte has two code paths, test both here */ test_string_conversion(NULL); test_string_conversion(&bUsedDefaultChar); + + test_undefined_byte_char(); }

1 0

Akihiro Sagawa : gdi32: Remove redundant charset assignments.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: f0881854712e55b9b1e85b939c65f3737d197fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0881854712e55b9b1e85b939… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Apr 1 21:19:57 2011 +0900 gdi32: Remove redundant charset assignments. --- dlls/gdi32/freetype.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 31fe4f2..0b50330 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4121,10 +4121,7 @@ static BOOL enum_face_charsets(Face *face, FONTENUMPROCW proc, LPARAM lparam) else { fs.fsCsb[0] = 1L << i; fs.fsCsb[1] = 0; - if(!TranslateCharsetInfo(fs.fsCsb, &csi, TCI_SRCFONTSIG)) - csi.ciCharset = DEFAULT_CHARSET; - if(i == 31) csi.ciCharset = SYMBOL_CHARSET; - if(csi.ciCharset != DEFAULT_CHARSET) { + if(TranslateCharsetInfo(fs.fsCsb, &csi, TCI_SRCFONTSIG)) elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = csi.ciCharset; if(ElfScriptsW[i]) strcpyW(elf.elfScript, ElfScriptsW[i]);

1 0

Gerald Pfeifer : gdiplus: Initialize a variable in SOFTWARE_GdipFillRegion to avoid a compiler warning .
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: 25764d79c01a0f01e2ece5f48e0ae09590eca1a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25764d79c01a0f01e2ece5f48… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 2 22:35:17 2011 +0200 gdiplus: Initialize a variable in SOFTWARE_GdipFillRegion to avoid a compiler warning. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4fdfa9c..cecc880 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3673,7 +3673,7 @@ static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, GpRectF graphics_bounds; UINT scans_count, i; INT dummy; - GpRect *scans; + GpRect *scans = NULL; DWORD *pixel_data; if (!brush_can_fill_pixels(brush))

1 0

Jörg Höhle : winmm: Check callback flags prior to opening a driver.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: c3774b664ad3cfd3b53eae19999489bc16904ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3774b664ad3cfd3b53eae199… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 15 23:00:04 2011 +0100 winmm: Check callback flags prior to opening a driver. --- dlls/winmm/tests/mixer.c | 35 ++++++++++++++++- dlls/winmm/winmm.c | 98 ++++++++++++++++++++++++++++------------------ 2 files changed, 94 insertions(+), 39 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 59627a7..da27b16 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -1004,6 +1004,7 @@ static void mixer_testsW(void) static void test_mixerOpen(void) { HMIXER mix; + HANDLE event; MMRESULT rc; UINT ndev, d; @@ -1031,7 +1032,7 @@ static void test_mixerOpen(void) rc = mixerOpen(&mix, d, 0xdeadbeef, 0, CALLBACK_WINDOW); ok(rc == MMSYSERR_INVALPARAM || - rc == MMSYSERR_NOERROR, /* 98 */ + broken(rc == MMSYSERR_NOERROR /* 98 */), "mixerOpen: MMSYSERR_INVALPARAM expected, got %s\n", mmsys_error(rc)); if (rc == MMSYSERR_NOERROR) @@ -1042,7 +1043,35 @@ static void test_mixerOpen(void) ok(rc == MMSYSERR_NOERROR, "mixerOpen: MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); + if (rc == MMSYSERR_NOERROR) + test_mixerClose(mix); + + rc = mixerOpen(&mix, d, 0, 0, CALLBACK_THREAD); + ok(rc == MMSYSERR_NOERROR /* since w2k */ || + rc == MMSYSERR_NOTSUPPORTED, /* 98 */ + "mixerOpen: MMSYSERR_NOERROR expected, got %s\n", + mmsys_error(rc)); + if (rc == MMSYSERR_NOERROR) + test_mixerClose(mix); + + rc = mixerOpen(&mix, d, 0, 0, CALLBACK_EVENT); + ok(rc == MMSYSERR_NOERROR /* since w2k */ || + rc == MMSYSERR_NOTSUPPORTED, /* 98 */ + "mixerOpen: MMSYSERR_NOERROR expected, got %s\n", + mmsys_error(rc)); + if (rc == MMSYSERR_NOERROR) + test_mixerClose(mix); + event = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "CreateEvent(): error=%d\n", GetLastError()); + + /* NOTSUPPORTED is not broken, but it enables the todo_wine marker. */ + rc = mixerOpen(&mix, d, (DWORD_PTR)event, 0, CALLBACK_EVENT); + todo_wine + ok(rc == MMSYSERR_NOERROR /* since w2k */ || + broken(rc == MMSYSERR_NOTSUPPORTED), /* 98 */ + "mixerOpen: MMSYSERR_NOERROR expected, got %s\n", + mmsys_error(rc)); if (rc == MMSYSERR_NOERROR) test_mixerClose(mix); @@ -1054,6 +1083,10 @@ static void test_mixerOpen(void) if (rc == MMSYSERR_NOERROR) test_mixerClose(mix); + + rc = WaitForSingleObject(event, 0); + ok(rc == WAIT_TIMEOUT, "WaitEvent %d\n", rc); + CloseHandle(event); } } diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 6d5950b..29f068b 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -173,6 +173,35 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) } /************************************************************************** + * WINMM_CheckCallback [internal] + */ +static MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) +{ + switch (fdwOpen & CALLBACK_TYPEMASK) { + case CALLBACK_NULL: /* dwCallback need not be NULL */ + break; + case CALLBACK_WINDOW: + if (dwCallback && !IsWindow((HWND)dwCallback)) + return MMSYSERR_INVALPARAM; + break; + + case CALLBACK_FUNCTION: + /* a NULL cb is acceptable since w2k, MMSYSERR_INVALPARAM earlier */ + if (mixer) + return MMSYSERR_INVALFLAG; /* since w2k, MMSYSERR_NOTSUPPORTED earlier */ + break; + case CALLBACK_THREAD: + case CALLBACK_EVENT: + if (mixer) /* FIXME: mixer supports THREAD+EVENT since w2k */ + return MMSYSERR_NOTSUPPORTED; /* w9X */ + break; + default: + WARN("Unknown callback type %d\n", HIWORD(fdwOpen)); + } + return MMSYSERR_NOERROR; +} + +/************************************************************************** * Mixer devices. New to Win95 */ @@ -297,35 +326,27 @@ UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, { HANDLE hMix; LPWINE_MLD wmld; - DWORD dwRet = 0; + DWORD dwRet; MIXEROPENDESC mod; TRACE("(%p, %d, %08lx, %08lx, %08x)\n", lphMix, uDeviceID, dwCallback, dwInstance, fdwOpen); - mod.dwCallback = (DWORD_PTR)MIXER_WCallback; - mod.dwInstance = 0; + dwRet = WINMM_CheckCallback(dwCallback, fdwOpen, TRUE); + if (dwRet != MMSYSERR_NOERROR) + return dwRet; -/* If callback is a function, - * dwCallback contains function pointer - * dwInstance private data - * - * if callback is a window - * dwCallback contains a window handle - */ - switch (fdwOpen & CALLBACK_TYPEMASK) { - default: - return MMSYSERR_INVALFLAG; - - case CALLBACK_NULL: - break; - - case CALLBACK_WINDOW: + mod.dwCallback = (DWORD_PTR)MIXER_WCallback; + if ((fdwOpen & CALLBACK_TYPEMASK) == CALLBACK_WINDOW) mod.dwInstance = dwCallback; - if (dwCallback && !IsWindow((HWND)dwCallback)) - return MMSYSERR_INVALPARAM; - break; - } + else + mod.dwInstance = 0; + + /* We're remapping to CALLBACK_FUNCTION because that's what old winmm is + * documented to do when opening the mixer driver. + * FIXME: Native supports CALLBACK_EVENT + CALLBACK_THREAD flags since w2k. + * FIXME: The non ALSA drivers ignore callback requests - bug. + */ wmld = MMDRV_Alloc(sizeof(WINE_MIXER), MMDRV_MIXER, &hMix, &fdwOpen, &dwCallback, &dwInstance); @@ -901,19 +922,16 @@ UINT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, { HMIDIOUT hMidiOut; LPWINE_MIDI lpwm; - UINT dwRet = 0; + UINT dwRet; TRACE("(%p, %d, %08lX, %08lX, %08X);\n", lphMidiOut, uDeviceID, dwCallback, dwInstance, dwFlags); if (lphMidiOut != NULL) *lphMidiOut = 0; - switch (dwFlags & CALLBACK_TYPEMASK) { - case CALLBACK_WINDOW: - if (dwCallback && !IsWindow((HWND)dwCallback)) - return MMSYSERR_INVALPARAM; - break; - } + dwRet = WINMM_CheckCallback(dwCallback, dwFlags, FALSE); + if (dwRet != MMSYSERR_NOERROR) + return dwRet; lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &dwFlags, 0, NULL); @@ -1200,13 +1218,17 @@ UINT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, { HANDLE hMidiIn; LPWINE_MIDI lpwm; - DWORD dwRet = 0; + DWORD dwRet; TRACE("(%p, %d, %08lX, %08lX, %08X);\n", lphMidiIn, uDeviceID, dwCallback, dwInstance, dwFlags); if (lphMidiIn != NULL) *lphMidiIn = 0; + dwRet = WINMM_CheckCallback(dwCallback, dwFlags, FALSE); + if (dwRet != MMSYSERR_NOERROR) + return dwRet; + lpwm = (LPWINE_MIDI)MMDRV_Alloc(sizeof(WINE_MIDI), MMDRV_MIDIIN, &hMidiIn, &dwFlags, &dwCallback, &dwInstance); @@ -1758,12 +1780,9 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, if (cMidi != 1 || lphMidiStrm == NULL || lpuDeviceID == NULL) return MMSYSERR_INVALPARAM; - switch (fdwOpen & CALLBACK_TYPEMASK) { - case CALLBACK_WINDOW: - if (dwCallback && !IsWindow((HWND)dwCallback)) - return MMSYSERR_INVALPARAM; - break; - } + ret = WINMM_CheckCallback(dwCallback, fdwOpen, FALSE); + if (ret != MMSYSERR_NOERROR) + return ret; lpMidiStrm = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_MIDIStream)); if (!lpMidiStrm) @@ -2012,7 +2031,7 @@ static UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType, { HANDLE handle; LPWINE_MLD wmld; - DWORD dwRet = MMSYSERR_NOERROR; + DWORD dwRet; WAVEOPENDESC wod; TRACE("(%p, %d, %s, %p, %08lX, %08lX, %08X);\n", @@ -2022,6 +2041,10 @@ static UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType, if (dwFlags & WAVE_FORMAT_QUERY) TRACE("WAVE_FORMAT_QUERY requested !\n"); + dwRet = WINMM_CheckCallback(dwCallback, dwFlags, FALSE); + if (dwRet != MMSYSERR_NOERROR) + return dwRet; + if (lpFormat == NULL) { WARN("bad format\n"); return WAVERR_BADFORMAT; @@ -2039,7 +2062,6 @@ static UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType, if ((wmld = MMDRV_Alloc(sizeof(WINE_WAVE), uType, &handle, &dwFlags, &dwCallback, &dwInstance)) == NULL) { - WARN("no memory\n"); return MMSYSERR_NOMEM; }

1 0

Gerald Pfeifer : winex11.drv: Initialize a variable in create_xcursor_frame to silence a warning.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: 4d936753321fb40a3eedd527f1b548e556e51af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d936753321fb40a3eedd527f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Apr 3 21:23:38 2011 +0200 winex11.drv: Initialize a variable in create_xcursor_frame to silence a warning. --- dlls/winex11.drv/mouse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index ab500ef..1a2d618 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -295,7 +295,7 @@ static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HA { XcursorImage *image, *ret = NULL; DWORD delay_jiffies, num_steps; - int x, y, i, has_alpha; + int x, y, i, has_alpha = FALSE; XcursorPixel *ptr; wine_tsx11_lock();

1 0

Andrew Nguyen : msvcrt: Ensure that old buffer contents are copied when allocating a growable pf_output buffer for the first time .
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: 5c57185060ce9863119d310ed380772866cb21bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c57185060ce9863119d310ed… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 3 23:05:20 2011 -0500 msvcrt: Ensure that old buffer contents are copied when allocating a growable pf_output buffer for the first time. --- dlls/msvcrt/wcs.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a7c7a77..fc77656 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -429,19 +429,39 @@ static inline int pf_check_auto_grow(pf_output *out, unsigned delta) out->len = max(out->len * 2, out->used + delta); if (out->unicode) { + WCHAR *ptr; + if (out->buf.W != out->grow.W) - out->buf.W = MSVCRT_realloc(out->buf.W, out->len * sizeof(WCHAR)); + { + if (!(ptr = MSVCRT_realloc(out->buf.W, out->len * sizeof(WCHAR)))) + return -1; + } else - out->buf.W = MSVCRT_malloc(out->len * sizeof(WCHAR)); - if (!out->buf.W) return -1; + { + if (!(ptr = MSVCRT_malloc(out->len * sizeof(WCHAR)))) + return -1; + memcpy(ptr, out->buf.W, out->used * sizeof(WCHAR)); + } + + out->buf.W = ptr; } else { + char *ptr; + if (out->buf.A != out->grow.A) - out->buf.A = MSVCRT_realloc(out->buf.A, out->len * sizeof(char)); + { + if (!(ptr = MSVCRT_realloc(out->buf.A, out->len * sizeof(char)))) + return -1; + } else - out->buf.A = MSVCRT_malloc(out->len * sizeof(char)); - if (!out->buf.A) return -1; + { + if (!(ptr = MSVCRT_malloc(out->len * sizeof(char)))) + return -1; + memcpy(ptr, out->buf.A, out->used * sizeof(char)); + } + + out->buf.A = ptr; } } return 0;

1 0

Akihiro Sagawa : gdi32: Create charset enumeration order list for EnumFontFamiliesEx.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: cb77f9a2395b31079ab72f99706be7f6b107dd69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb77f9a2395b31079ab72f997… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Apr 1 21:20:00 2011 +0900 gdi32: Create charset enumeration order list for EnumFontFamiliesEx. --- dlls/gdi32/freetype.c | 96 ++++++++++++++++++++++++++++++++++++++-------- dlls/gdi32/tests/font.c | 14 +----- 2 files changed, 82 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0b50330..aefb0e8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -354,6 +354,17 @@ typedef struct { struct list links; } SYSTEM_LINKS; +struct enum_charset_element { + DWORD mask; + DWORD charset; + LPCWSTR name; +}; + +struct enum_charset_list { + DWORD total; + struct enum_charset_element element[32]; +}; + #define GM_BLOCK_SIZE 128 #define FONT_GM(font,idx) (&(font)->gm[(idx) / GM_BLOCK_SIZE][(idx) % GM_BLOCK_SIZE]) @@ -3951,6 +3962,59 @@ BOOL WineEngDestroyFontInstance(HFONT handle) return ret; } +/*************************************************** + * create_enum_charset_list + * + * This function creates charset enumeration list because in DEFAULT_CHARSET + * case, the ANSI codepage's charset takes precedence over other charsets. + * This function works as a filter other than DEFAULT_CHARSET case. + */ +static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *list) +{ + CHARSETINFO csi; + DWORD n = 0; + + if (TranslateCharsetInfo((DWORD*)charset, &csi, TCI_SRCCHARSET) && + csi.fs.fsCsb[0] != 0) { + list->element[n].mask = csi.fs.fsCsb[0]; + list->element[n].charset = csi.ciCharset; + list->element[n].name = ElfScriptsW[ffs(csi.fs.fsCsb[0]) - 1]; + n++; + } + else { /* charset is DEFAULT_CHARSET or invalid. */ + INT acp, i; + + /* Set the current codepage's charset as the first element. */ + acp = GetACP(); + if (TranslateCharsetInfo((DWORD*)(INT_PTR)acp, &csi, TCI_SRCCODEPAGE) && + csi.fs.fsCsb[0] != 0) { + list->element[n].mask = csi.fs.fsCsb[0]; + list->element[n].charset = csi.ciCharset; + list->element[n].name = ElfScriptsW[ffs(csi.fs.fsCsb[0]) - 1]; + n++; + } + + /* Fill out left elements. */ + for (i = 0; i < 32; i++) { + FONTSIGNATURE fs; + fs.fsCsb[0] = 1L << i; + fs.fsCsb[1] = 0; + if (n > 0 && fs.fsCsb[0] == list->element[0].mask) + continue; /* skip, already added. */ + if (!TranslateCharsetInfo(fs.fsCsb, &csi, TCI_SRCFONTSIG)) + continue; /* skip, this is an invalid fsCsb bit. */ + + list->element[n].mask = fs.fsCsb[0]; + list->element[n].charset = csi.ciCharset; + list->element[n].name = ElfScriptsW[i]; + n++; + } + } + list->total = n; + + return n; +} + static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, NEWTEXTMETRICEXW *pntm, LPDWORD ptype) { @@ -4101,38 +4165,33 @@ static BOOL face_matches(Face *face, const LOGFONTW *lf) return !strcmpiW(lf->lfFaceName, full_family_name); } -static BOOL enum_face_charsets(Face *face, FONTENUMPROCW proc, LPARAM lparam) +static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, + FONTENUMPROCW proc, LPARAM lparam) { ENUMLOGFONTEXW elf; NEWTEXTMETRICEXW ntm; DWORD type = 0; - FONTSIGNATURE fs; - CHARSETINFO csi; int i; GetEnumStructs(face, &elf, &ntm, &type); - for(i = 0; i < 32; i++) { + for(i = 0; i < list->total; i++) { if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; strcpyW(elf.elfScript, OEM_DOSW); i = 32; /* break out of loop */ - } else if(!(face->fs.fsCsb[0] & (1L << i))) + } else if(!(face->fs.fsCsb[0] & list->element[i].mask)) continue; else { - fs.fsCsb[0] = 1L << i; - fs.fsCsb[1] = 0; - if(TranslateCharsetInfo(fs.fsCsb, &csi, TCI_SRCFONTSIG)) - elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = csi.ciCharset; - if(ElfScriptsW[i]) - strcpyW(elf.elfScript, ElfScriptsW[i]); - else - FIXME("Unknown elfscript for bit %d\n", i); - } + elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = list->element[i].charset; + if(list->element[i].name) + strcpyW(elf.elfScript, list->element[i].name); + else + FIXME("Unknown elfscript for bit %d\n", ffs(list->element[i].mask) - 1); } TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", debugstr_w(elf.elfLogFont.lfFaceName), debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), - csi.ciCharset, type, debugstr_w(elf.elfScript), + list->element[i].charset, type, debugstr_w(elf.elfScript), elf.elfLogFont.lfItalic, elf.elfLogFont.lfWeight, ntm.ntmTm.ntmFlags); /* release section before callback (FIXME) */ @@ -4153,6 +4212,7 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) Face *face; struct list *family_elem_ptr, *face_elem_ptr; LOGFONTW lf; + struct enum_charset_list enum_charsets; if (!plf) { @@ -4164,6 +4224,8 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) TRACE("facename = %s charset %d\n", debugstr_w(plf->lfFaceName), plf->lfCharSet); + create_enum_charset_list(plf->lfCharSet, &enum_charsets); + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); if(plf->lfFaceName[0]) { @@ -4184,7 +4246,7 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if (!face_matches(face, plf)) continue; - if (!enum_face_charsets(face, proc, lparam)) return 0; + if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return 0; } } } @@ -4193,7 +4255,7 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) family = LIST_ENTRY(family_elem_ptr, Family, entry); face_elem_ptr = list_head(&family->faces); face = LIST_ENTRY(face_elem_ptr, Face, entry); - if (!enum_face_charsets(face, proc, lparam)) return 0; + if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return 0; } } LeaveCriticalSection( &freetype_cs ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b0f2e9f..2d4efff 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2210,17 +2210,9 @@ static void test_EnumFontFamiliesEx_default_charset(void) } trace("'%s' has %d charsets.\n", gui_font.lfFaceName, efd.total); - if (gui_font.lfCharSet != ANSI_CHARSET) { - todo_wine - ok(efd.lf[0].lfCharSet == gui_font.lfCharSet, - "(%s) got charset %d expected %d\n", - efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, gui_font.lfCharSet); - } - else { - ok(efd.lf[0].lfCharSet == gui_font.lfCharSet, - "(%s) got charset %d expected %d\n", - efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, gui_font.lfCharSet); - } + ok(efd.lf[0].lfCharSet == gui_font.lfCharSet, + "(%s) got charset %d expected %d\n", + efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, gui_font.lfCharSet); return; }

1 0

Akihiro Sagawa : gdi32: Move charset enumeration to helper function.
by Alexandre Julliard April 4, 2011

April 4, 2011

Module: wine Branch: master Commit: 6a404a3b5881f0e14cb7022d247fe89f1196a6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a404a3b5881f0e14cb7022d2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Apr 1 21:19:54 2011 +0900 gdi32: Move charset enumeration to helper function. --- dlls/gdi32/freetype.c | 125 ++++++++++++++++++------------------------------ 1 files changed, 47 insertions(+), 78 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4582216..31fe4f2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4101,6 +4101,51 @@ static BOOL face_matches(Face *face, const LOGFONTW *lf) return !strcmpiW(lf->lfFaceName, full_family_name); } +static BOOL enum_face_charsets(Face *face, FONTENUMPROCW proc, LPARAM lparam) +{ + ENUMLOGFONTEXW elf; + NEWTEXTMETRICEXW ntm; + DWORD type = 0; + FONTSIGNATURE fs; + CHARSETINFO csi; + int i; + + GetEnumStructs(face, &elf, &ntm, &type); + for(i = 0; i < 32; i++) { + if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ + elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; + strcpyW(elf.elfScript, OEM_DOSW); + i = 32; /* break out of loop */ + } else if(!(face->fs.fsCsb[0] & (1L << i))) + continue; + else { + fs.fsCsb[0] = 1L << i; + fs.fsCsb[1] = 0; + if(!TranslateCharsetInfo(fs.fsCsb, &csi, TCI_SRCFONTSIG)) + csi.ciCharset = DEFAULT_CHARSET; + if(i == 31) csi.ciCharset = SYMBOL_CHARSET; + if(csi.ciCharset != DEFAULT_CHARSET) { + elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = csi.ciCharset; + if(ElfScriptsW[i]) + strcpyW(elf.elfScript, ElfScriptsW[i]); + else + FIXME("Unknown elfscript for bit %d\n", i); + } + } + TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", + debugstr_w(elf.elfLogFont.lfFaceName), + debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), + csi.ciCharset, type, debugstr_w(elf.elfScript), + elf.elfLogFont.lfItalic, elf.elfLogFont.lfWeight, + ntm.ntmTm.ntmFlags); + /* release section before callback (FIXME) */ + LeaveCriticalSection( &freetype_cs ); + if (!proc(&elf.elfLogFont, (TEXTMETRICW *)&ntm, type, lparam)) return FALSE; + EnterCriticalSection( &freetype_cs ); + } + return TRUE; +} + /************************************************************* * WineEngEnumFonts * @@ -4110,13 +4155,7 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) Family *family; Face *face; struct list *family_elem_ptr, *face_elem_ptr; - ENUMLOGFONTEXW elf; - NEWTEXTMETRICEXW ntm; - DWORD type; - FONTSIGNATURE fs; - CHARSETINFO csi; LOGFONTW lf; - int i; if (!plf) { @@ -4147,44 +4186,8 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) if(family_matches(family, plf)) { LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); - if (!face_matches(face, plf)) continue; - - GetEnumStructs(face, &elf, &ntm, &type); - for(i = 0; i < 32; i++) { - if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ - elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; - strcpyW(elf.elfScript, OEM_DOSW); - i = 32; /* break out of loop */ - } else if(!(face->fs.fsCsb[0] & (1L << i))) - continue; - else { - fs.fsCsb[0] = 1L << i; - fs.fsCsb[1] = 0; - if(!TranslateCharsetInfo(fs.fsCsb, &csi, - TCI_SRCFONTSIG)) - csi.ciCharset = DEFAULT_CHARSET; - if(i == 31) csi.ciCharset = SYMBOL_CHARSET; - if(csi.ciCharset != DEFAULT_CHARSET) { - elf.elfLogFont.lfCharSet = - ntm.ntmTm.tmCharSet = csi.ciCharset; - if(ElfScriptsW[i]) - strcpyW(elf.elfScript, ElfScriptsW[i]); - else - FIXME("Unknown elfscript for bit %d\n", i); - } - } - TRACE("enuming face %s full %s style %s charset %d type %d script %s it %d weight %d ntmflags %08x\n", - debugstr_w(elf.elfLogFont.lfFaceName), - debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), - csi.ciCharset, type, debugstr_w(elf.elfScript), - elf.elfLogFont.lfItalic, elf.elfLogFont.lfWeight, - ntm.ntmTm.ntmFlags); - /* release section before callback (FIXME) */ - LeaveCriticalSection( &freetype_cs ); - if (!proc(&elf.elfLogFont, (TEXTMETRICW *)&ntm, type, lparam)) return 0; - EnterCriticalSection( &freetype_cs ); - } + if (!enum_face_charsets(face, proc, lparam)) return 0; } } } @@ -4193,41 +4196,7 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) family = LIST_ENTRY(family_elem_ptr, Family, entry); face_elem_ptr = list_head(&family->faces); face = LIST_ENTRY(face_elem_ptr, Face, entry); - GetEnumStructs(face, &elf, &ntm, &type); - for(i = 0; i < 32; i++) { - if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ - elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; - strcpyW(elf.elfScript, OEM_DOSW); - i = 32; /* break out of loop */ - } else if(!(face->fs.fsCsb[0] & (1L << i))) - continue; - else { - fs.fsCsb[0] = 1L << i; - fs.fsCsb[1] = 0; - if(!TranslateCharsetInfo(fs.fsCsb, &csi, - TCI_SRCFONTSIG)) - csi.ciCharset = DEFAULT_CHARSET; - if(i == 31) csi.ciCharset = SYMBOL_CHARSET; - if(csi.ciCharset != DEFAULT_CHARSET) { - elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = - csi.ciCharset; - if(ElfScriptsW[i]) - strcpyW(elf.elfScript, ElfScriptsW[i]); - else - FIXME("Unknown elfscript for bit %d\n", i); - } - } - TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", - debugstr_w(elf.elfLogFont.lfFaceName), - debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), - csi.ciCharset, type, debugstr_w(elf.elfScript), - elf.elfLogFont.lfItalic, elf.elfLogFont.lfWeight, - ntm.ntmTm.ntmFlags); - /* release section before callback (FIXME) */ - LeaveCriticalSection( &freetype_cs ); - if (!proc(&elf.elfLogFont, (TEXTMETRICW *)&ntm, type, lparam)) return 0; - EnterCriticalSection( &freetype_cs ); - } + if (!enum_face_charsets(face, proc, lparam)) return 0; } } LeaveCriticalSection( &freetype_cs );

1 0