May 2015 - Wine-commits - list.winehq.org

Martin Storsjo : kernel32: Implement GetSystemTimePreciseAsFileTime.
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: c9c5ceccb4f50a81a0f99d683a46dc1f5d4ede62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c5ceccb4f50a81a0f99d683… Author: Martin Storsjo <martin(a)martin.st> Date: Tue May 19 22:20:46 2015 +0300 kernel32: Implement GetSystemTimePreciseAsFileTime. This just falls back to doing the same as GetSystemTimeAsFileTime. --- .../api-ms-win-core-sysinfo-l1-2-0.spec | 2 +- .../api-ms-win-core-sysinfo-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/time.c | 42 ++++++++++++++++++++++ dlls/kernel32/time.c | 15 ++++++++ include/winbase.h | 1 + 6 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec index d3df6bd..9b05674 100644 --- a/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec +++ b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec @@ -14,7 +14,7 @@ @ stdcall GetSystemTime(ptr) kernel32.GetSystemTime @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment @ stdcall GetSystemTimeAsFileTime(ptr) kernel32.GetSystemTimeAsFileTime -@ stub GetSystemTimePreciseAsFileTime +@ stdcall GetSystemTimePreciseAsFileTime(ptr) kernel32.GetSystemTimePreciseAsFileTime @ stdcall GetSystemWindowsDirectoryA(ptr long) kernel32.GetSystemWindowsDirectoryA @ stdcall GetSystemWindowsDirectoryW(ptr long) kernel32.GetSystemWindowsDirectoryW @ stdcall GetTickCount() kernel32.GetTickCount diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec index 29262c5..018ab05 100644 --- a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec +++ b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec @@ -16,7 +16,7 @@ @ stdcall GetSystemTime(ptr) kernel32.GetSystemTime @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment @ stdcall GetSystemTimeAsFileTime(ptr) kernel32.GetSystemTimeAsFileTime -@ stub GetSystemTimePreciseAsFileTime +@ stdcall GetSystemTimePreciseAsFileTime(ptr) kernel32.GetSystemTimePreciseAsFileTime @ stdcall GetSystemWindowsDirectoryA(ptr long) kernel32.GetSystemWindowsDirectoryA @ stdcall GetSystemWindowsDirectoryW(ptr long) kernel32.GetSystemWindowsDirectoryW @ stdcall -ret64 GetTickCount64() kernel32.GetTickCount64 diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1261738..8f6a13e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -829,6 +829,7 @@ @ stdcall GetSystemTime(ptr) @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) @ stdcall GetSystemTimeAsFileTime(ptr) +@ stdcall GetSystemTimePreciseAsFileTime(ptr) @ stdcall GetSystemTimes(ptr ptr ptr) @ stdcall GetSystemWindowsDirectoryA(ptr long) @ stdcall GetSystemWindowsDirectoryW(ptr long) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 378941d..d205174 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -28,6 +28,7 @@ static BOOL (WINAPI *pSystemTimeToTzSpecificLocalTime)(LPTIME_ZONE_INFORMATION, static int (WINAPI *pGetCalendarInfoA)(LCID,CALID,CALTYPE,LPSTR,int,LPDWORD); static int (WINAPI *pGetCalendarInfoW)(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD); static DWORD (WINAPI *pGetDynamicTimeZoneInformation)(DYNAMIC_TIME_ZONE_INFORMATION*); +static void (WINAPI *pGetSystemTimePreciseAsFileTime)(LPFILETIME); #define SECSPERMIN 60 #define SECSPERDAY 86400 @@ -761,6 +762,45 @@ static void test_GetDynamicTimeZoneInformation(void) trace("Dyn TimeZoneKeyName %s\n", wine_dbgstr_w(dyninfo.TimeZoneKeyName)); } +static ULONGLONG get_longlong_time(FILETIME *time) +{ + ULARGE_INTEGER uli; + uli.LowPart = time->dwLowDateTime; + uli.HighPart = time->dwHighDateTime; + return uli.QuadPart; +} + +static void test_GetSystemTimePreciseAsFileTime(void) +{ + FILETIME ft; + ULONGLONG time1, time2; + LONGLONG diff; + + if (!pGetSystemTimePreciseAsFileTime) + { + win_skip("GetSystemTimePreciseAsFileTime() is not supported.\n"); + return; + } + + GetSystemTimeAsFileTime(&ft); + time1 = get_longlong_time(&ft); + pGetSystemTimePreciseAsFileTime(&ft); + time2 = get_longlong_time(&ft); + diff = time2 - time1; + if (diff < 0) + diff = -diff; + ok(diff < 1000000, "Difference between GetSystemTimeAsFileTime and GetSystemTimePreciseAsFileTime more than 100 ms\n"); + + pGetSystemTimePreciseAsFileTime(&ft); + time1 = get_longlong_time(&ft); + do { + pGetSystemTimePreciseAsFileTime(&ft); + time2 = get_longlong_time(&ft); + } while (time2 == time1); + diff = time2 - time1; + ok(diff < 10000 && diff > 0, "GetSystemTimePreciseAsFileTime incremented by more than 1 ms\n"); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandleA("kernel32"); @@ -769,6 +809,7 @@ START_TEST(time) pGetCalendarInfoA = (void *)GetProcAddress(hKernel, "GetCalendarInfoA"); pGetCalendarInfoW = (void *)GetProcAddress(hKernel, "GetCalendarInfoW"); pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation"); + pGetSystemTimePreciseAsFileTime = (void *)GetProcAddress(hKernel, "GetSystemTimePreciseAsFileTime"); test_conversions(); test_invalid_arg(); @@ -779,4 +820,5 @@ START_TEST(time) test_FileTimeToDosDateTime(); test_GetCalendarInfo(); test_GetDynamicTimeZoneInformation(); + test_GetSystemTimePreciseAsFileTime(); } diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 2b8e1d9..daafc7f 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -548,6 +548,21 @@ VOID WINAPI GetSystemTimeAsFileTime( } +/*********************************************************************** + * GetSystemTimePreciseAsFileTime (KERNEL32.@) + * + * Get the current time in utc format, with <1 us precision. + * + * RETURNS + * Nothing. + */ +VOID WINAPI GetSystemTimePreciseAsFileTime( + LPFILETIME time) /* [out] Destination for the current utc time */ +{ + GetSystemTimeAsFileTime(time); +} + + /********************************************************************* * TIME_ClockTimeToFileTime (olorin(a)fandra.org, 20-Sep-1998) * diff --git a/include/winbase.h b/include/winbase.h index a8f3fb6..7540e6d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2040,6 +2040,7 @@ WINBASEAPI BOOL WINAPI GetSystemRegistryQuota(PDWORD,PDWORD); WINBASEAPI VOID WINAPI GetSystemTime(LPSYSTEMTIME); WINBASEAPI BOOL WINAPI GetSystemTimeAdjustment(PDWORD,PDWORD,PBOOL); WINBASEAPI VOID WINAPI GetSystemTimeAsFileTime(LPFILETIME); +WINBASEAPI VOID WINAPI GetSystemTimePreciseAsFileTime(LPFILETIME); WINBASEAPI UINT WINAPI GetSystemWindowsDirectoryA(LPSTR,UINT); WINBASEAPI UINT WINAPI GetSystemWindowsDirectoryW(LPWSTR,UINT); #define GetSystemWindowsDirectory WINELIB_NAME_AW(GetSystemWindowsDirectory)

1 0

Nikolay Sivov : xmllite/writer: Implement WriteEndDocument().
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: aadd9ff1599c3addcf81c63e676a12a65b37ceec URL: http://source.winehq.org/git/wine.git/?a=commit;h=aadd9ff1599c3addcf81c63e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 19 21:59:59 2015 +0300 xmllite/writer: Implement WriteEndDocument(). --- dlls/xmllite/tests/writer.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 44 ++++++++++++++++++++++++++--- 2 files changed, 107 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 984a34d..d81a934 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -670,6 +670,72 @@ static void test_writeendelement(void) IStream_Release(stream); } +static void test_writeenddocument(void) +{ + static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; + IXmlWriter *writer; + IStream *stream; + HGLOBAL hglobal; + HRESULT hr; + char *ptr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* WriteEndDocument resets it to initial state */ + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr == NULL, "got %p\n", ptr); + + /* we still need to flush manually, WriteEndDocument doesn't do that */ + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr != NULL, "got %p\n", ptr); + ok(!strncmp(ptr, "<a><b /></a>", 12), "got %s\n", ptr); + GlobalUnlock(hglobal); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { if (!init_pointers()) @@ -683,4 +749,5 @@ START_TEST(writer) test_flush(); test_omitxmldeclaration(); test_bom(); + test_writeenddocument(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index abbe07d..8387935 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -59,7 +59,8 @@ typedef enum XmlWriterState_PIDocStarted, /* document was started with manually added 'xml' PI */ XmlWriterState_DocStarted, /* document was started with WriteStartDocument() */ XmlWriterState_ElemStarted, /* writing element */ - XmlWriterState_Content /* content is accepted at this point */ + XmlWriterState_Content, /* content is accepted at this point */ + XmlWriterState_DocClosed /* WriteEndDocument was called */ } XmlWriterState; typedef struct @@ -608,6 +609,8 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr case XmlWriterState_ElemStarted: writer_close_starttag(This); break; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; default: ; } @@ -631,10 +634,34 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr static HRESULT WINAPI xmlwriter_WriteEndDocument(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); + HRESULT hr = S_OK; - FIXME("%p\n", This); + TRACE("%p\n", This); - return E_NOTIMPL; + switch (This->state) + { + case XmlWriterState_Initial: + hr = E_UNEXPECTED; + break; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + hr = WR_E_INVALIDACTION; + break; + default: + ; + } + + if (FAILED(hr)) { + This->state = XmlWriterState_DocClosed; + return hr; + } + + /* empty element stack */ + while (IXmlWriter_WriteEndElement(iface) == S_OK) + ; + + This->state = XmlWriterState_DocClosed; + return S_OK; } static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) @@ -749,6 +776,7 @@ static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LP return WR_E_INVALIDACTION; break; case XmlWriterState_ElemStarted: + case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; default: ; @@ -812,6 +840,7 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal return S_OK; case XmlWriterState_DocStarted: case XmlWriterState_ElemStarted: + case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; default: ; @@ -853,8 +882,15 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre TRACE("(%p)->(%s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri)); - if (This->state == XmlWriterState_Initial) + switch (This->state) + { + case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } if (!local_name) return E_INVALIDARG;

1 0

Matteo Bruni : wined3d: Dirtify vertex shader on transformed <-> untransformed transitions.
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: 409cda0ac26177a8edd7b1afccb951571ca55695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=409cda0ac26177a8edd7b1afc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 19 23:32:31 2015 +0200 wined3d: Dirtify vertex shader on transformed <-> untransformed transitions. --- dlls/wined3d/glsl_shader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0a130e1..c85508c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7682,6 +7682,12 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, context->last_was_rhw = transformed; + /* If the vertex declaration contains a transformed position attribute, + * the draw uses the fixed function vertex pipeline regardless of any + * vertex shader set by the application. */ + if (transformed != wasrhw) + context->shader_update_mask |= 1 << WINED3D_SHADER_TYPE_VERTEX; + if (!use_vs(state)) { if (context->last_was_vshader)

1 0

Matteo Bruni : wined3d: Fix fragment shaders sampling directly into oC[n] in the ARB backend.
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: 5b911ed461c6f7f059668bac66bd49ddcd694045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b911ed461c6f7f059668bac6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 19 23:32:32 2015 +0200 wined3d: Fix fragment shaders sampling directly into oC[n] in the ARB backend. --- dlls/wined3d/arb_program_shader.c | 118 ++++++++++++++++++++++++++------------ 1 file changed, 81 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a45d25f..1e8784e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1271,55 +1271,86 @@ static const char *shader_arb_get_fixup_swizzle(enum fixup_channel_source channe } } -static void gen_color_correction(struct wined3d_string_buffer *buffer, const char *reg, - DWORD dst_mask, const char *one, const char *two, struct color_fixup_desc fixup) +struct color_fixup_masks { - DWORD mask; + DWORD source; + DWORD sign; +}; + +static struct color_fixup_masks calc_color_correction(struct color_fixup_desc fixup, DWORD dst_mask) +{ + struct color_fixup_masks masks = {0, 0}; if (is_complex_fixup(fixup)) { enum complex_fixup complex_fixup = get_complex_fixup(fixup); FIXME("Complex fixup (%#x) not supported\n", complex_fixup); - return; + return masks; } - mask = 0; - if (fixup.x_source != CHANNEL_SOURCE_X) mask |= WINED3DSP_WRITEMASK_0; - if (fixup.y_source != CHANNEL_SOURCE_Y) mask |= WINED3DSP_WRITEMASK_1; - if (fixup.z_source != CHANNEL_SOURCE_Z) mask |= WINED3DSP_WRITEMASK_2; - if (fixup.w_source != CHANNEL_SOURCE_W) mask |= WINED3DSP_WRITEMASK_3; - mask &= dst_mask; + if (fixup.x_source != CHANNEL_SOURCE_X) + masks.source |= WINED3DSP_WRITEMASK_0; + if (fixup.y_source != CHANNEL_SOURCE_Y) + masks.source |= WINED3DSP_WRITEMASK_1; + if (fixup.z_source != CHANNEL_SOURCE_Z) + masks.source |= WINED3DSP_WRITEMASK_2; + if (fixup.w_source != CHANNEL_SOURCE_W) + masks.source |= WINED3DSP_WRITEMASK_3; + masks.source &= dst_mask; + + if (fixup.x_sign_fixup) + masks.sign |= WINED3DSP_WRITEMASK_0; + if (fixup.y_sign_fixup) + masks.sign |= WINED3DSP_WRITEMASK_1; + if (fixup.z_sign_fixup) + masks.sign |= WINED3DSP_WRITEMASK_2; + if (fixup.w_sign_fixup) + masks.sign |= WINED3DSP_WRITEMASK_3; + masks.sign &= dst_mask; + + return masks; +} + +static void gen_color_correction(struct wined3d_string_buffer *buffer, const char *dst, + const char *src, const char *one, const char *two, + struct color_fixup_desc fixup, struct color_fixup_masks masks) +{ + const char *sign_fixup_src = dst; - if (mask) + if (masks.source) { - shader_addline(buffer, "SWZ %s, %s, %s, %s, %s, %s;\n", reg, reg, + if (masks.sign) + sign_fixup_src = "TA"; + + shader_addline(buffer, "SWZ %s, %s, %s, %s, %s, %s;\n", sign_fixup_src, src, shader_arb_get_fixup_swizzle(fixup.x_source), shader_arb_get_fixup_swizzle(fixup.y_source), shader_arb_get_fixup_swizzle(fixup.z_source), shader_arb_get_fixup_swizzle(fixup.w_source)); } + else if (masks.sign) + { + sign_fixup_src = src; + } - mask = 0; - if (fixup.x_sign_fixup) mask |= WINED3DSP_WRITEMASK_0; - if (fixup.y_sign_fixup) mask |= WINED3DSP_WRITEMASK_1; - if (fixup.z_sign_fixup) mask |= WINED3DSP_WRITEMASK_2; - if (fixup.w_sign_fixup) mask |= WINED3DSP_WRITEMASK_3; - mask &= dst_mask; - - if (mask) + if (masks.sign) { char reg_mask[6]; char *ptr = reg_mask; - if (mask != WINED3DSP_WRITEMASK_ALL) + if (masks.sign != WINED3DSP_WRITEMASK_ALL) { *ptr++ = '.'; - if (mask & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; - if (mask & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; - if (mask & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; - if (mask & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; + if (masks.sign & WINED3DSP_WRITEMASK_0) + *ptr++ = 'x'; + if (masks.sign & WINED3DSP_WRITEMASK_1) + *ptr++ = 'y'; + if (masks.sign & WINED3DSP_WRITEMASK_2) + *ptr++ = 'z'; + if (masks.sign & WINED3DSP_WRITEMASK_3) + *ptr++ = 'w'; } *ptr = '\0'; - shader_addline(buffer, "MAD %s%s, %s, %s, -%s;\n", reg, reg_mask, reg, two, one); + shader_addline(buffer, "MAD %s%s, %s, %s, -%s;\n", dst, reg_mask, sign_fixup_src, two, one); } } @@ -1378,6 +1409,8 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD const struct wined3d_shader *shader; const struct wined3d_device *device; const struct wined3d_gl_info *gl_info; + const char *tex_dst = dst_str; + struct color_fixup_masks masks; /* D3D vertex shader sampler IDs are vertex samplers(0-3), not global d3d samplers */ if(!pshader) sampler_idx += MAX_FRAGMENT_SAMPLERS; @@ -1433,18 +1466,27 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD sampler_idx = priv->cur_vs_args->vertex.samplers[sampler_idx - MAX_FRAGMENT_SAMPLERS]; } + if (pshader) + { + masks = calc_color_correction(priv->cur_ps_args->super.color_fixup[sampler_idx], + ins->dst[0].write_mask); + + if (masks.source || masks.sign) + tex_dst = "TA"; + } + if (flags & TEX_DERIV) { if(flags & TEX_PROJ) FIXME("Projected texture sampling with custom derivatives\n"); if(flags & TEX_BIAS) FIXME("Biased texture sampling with custom derivatives\n"); - shader_addline(buffer, "TXD%s %s, %s, %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, - dsx, dsy,sampler_idx, tex_type); + shader_addline(buffer, "TXD%s %s, %s, %s, %s, texture[%u], %s;\n", mod, tex_dst, coord_reg, + dsx, dsy, sampler_idx, tex_type); } else if(flags & TEX_LOD) { if(flags & TEX_PROJ) FIXME("Projected texture sampling with explicit lod\n"); if(flags & TEX_BIAS) FIXME("Biased texture sampling with explicit lod\n"); - shader_addline(buffer, "TXL%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, + shader_addline(buffer, "TXL%s %s, %s, texture[%u], %s;\n", mod, tex_dst, coord_reg, sampler_idx, tex_type); } else if (flags & TEX_BIAS) @@ -1452,11 +1494,11 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD /* Shouldn't be possible, but let's check for it */ if(flags & TEX_PROJ) FIXME("Biased and Projected texture sampling\n"); /* TXB takes the 4th component of the source vector automatically, as d3d. Nothing more to do */ - shader_addline(buffer, "TXB%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); + shader_addline(buffer, "TXB%s %s, %s, texture[%u], %s;\n", mod, tex_dst, coord_reg, sampler_idx, tex_type); } else if (flags & TEX_PROJ) { - shader_addline(buffer, "TXP%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); + shader_addline(buffer, "TXP%s %s, %s, texture[%u], %s;\n", mod, tex_dst, coord_reg, sampler_idx, tex_type); } else { @@ -1466,18 +1508,18 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD shader_addline(buffer, "MUL TA, np2fixup[%u].%s, %s;\n", idx >> 1, (idx % 2) ? "zwxy" : "xyzw", coord_reg); - shader_addline(buffer, "TEX%s %s, TA, texture[%u], %s;\n", mod, dst_str, sampler_idx, tex_type); + shader_addline(buffer, "TEX%s %s, TA, texture[%u], %s;\n", mod, tex_dst, sampler_idx, tex_type); } else - shader_addline(buffer, "TEX%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); + shader_addline(buffer, "TEX%s %s, %s, texture[%u], %s;\n", mod, tex_dst, coord_reg, sampler_idx, tex_type); } if (pshader) { - gen_color_correction(buffer, dst_str, ins->dst[0].write_mask, + gen_color_correction(buffer, dst_str, tex_dst, arb_get_helper_value(WINED3D_SHADER_TYPE_PIXEL, ARB_ONE), arb_get_helper_value(WINED3D_SHADER_TYPE_PIXEL, ARB_TWO), - priv->cur_ps_args->super.color_fixup[sampler_idx]); + priv->cur_ps_args->super.color_fixup[sampler_idx], masks); } } @@ -6238,6 +6280,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con BOOL op_equal; const char *final_combiner_src = "ret"; BOOL custom_linear_fog = FALSE; + struct color_fixup_masks masks; if (!string_buffer_init(&buffer)) { @@ -6426,8 +6469,9 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con } sprintf(colorcor_dst, "tex%u", stage); - gen_color_correction(&buffer, colorcor_dst, WINED3DSP_WRITEMASK_ALL, "const.x", "const.y", - settings->op[stage].color_fixup); + masks = calc_color_correction(settings->op[stage].color_fixup, WINED3DSP_WRITEMASK_ALL); + gen_color_correction(&buffer, colorcor_dst, colorcor_dst, "const.x", "const.y", + settings->op[stage].color_fixup, masks); } if (settings->color_key_enabled)

1 0

Matteo Bruni : ntdll: Implement a read_directory_getattrlist() function.
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: 5d65b9d0c2af38e11b59719f3888944ad29b41b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d65b9d0c2af38e11b59719f3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 19 23:59:06 2015 +0200 ntdll: Implement a read_directory_getattrlist() function. When searching for a specific filename on a case-insensitive filesystem we first try with stat(). If stat() does find the file we currently return the requested filename back. That presents an issue when the application cares about the casing of the actual file stored on-disk. Specifically, NtQueryDirectoryFile is supposed to return the actual filename with correct casing. One possible solution to the issue, without having to resort to manually scanning the directory entries, is to make use of the OS X getattrlist() function, since it can return the filename stored on the filesystem. --- dlls/ntdll/directory.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cbfc022..81b5c2e 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2112,6 +2112,77 @@ done: return ret; } +#ifdef HAVE_GETATTRLIST +/*********************************************************************** + * read_directory_getattrlist + * + * Read a single file from a directory by determining whether the file + * identified by mask exists using getattrlist. + */ +static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG length, + BOOLEAN single_entry, const UNICODE_STRING *mask, + BOOLEAN restart_scan, FILE_INFORMATION_CLASS class ) +{ + int unix_len, ret, used_default; + char *unix_name; + struct attrlist attrlist; + struct + { + u_int32_t length; + struct attrreference name_reference; + char name[NAME_MAX + 1]; + } attrlist_buffer; + + TRACE("looking up file %s\n", debugstr_us( mask )); + + unix_len = ntdll_wcstoumbs( 0, mask->Buffer, mask->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ); + if (!(unix_name = RtlAllocateHeap( GetProcessHeap(), 0, unix_len + 1))) + { + io->u.Status = STATUS_NO_MEMORY; + return 0; + } + ret = ntdll_wcstoumbs( 0, mask->Buffer, mask->Length / sizeof(WCHAR), unix_name, unix_len, + NULL, &used_default ); + if (ret > 0 && !used_default) + { + unix_name[ret] = 0; + if (restart_scan) + { + lseek( fd, 0, SEEK_SET ); + } + else if (lseek( fd, 0, SEEK_CUR ) != 0) + { + io->u.Status = STATUS_NO_MORE_FILES; + ret = 0; + goto done; + } + + memset( &attrlist, 0, sizeof(attrlist) ); + attrlist.bitmapcount = ATTR_BIT_MAP_COUNT; + attrlist.commonattr = ATTR_CMN_NAME; + ret = getattrlist( unix_name, &attrlist, &attrlist_buffer, sizeof(attrlist_buffer), 0 ); + if (!ret) + { + union file_directory_info *info = append_entry( buffer, io, length, attrlist_buffer.name, NULL, NULL, class ); + if (info) + { + info->next = 0; + if (io->u.Status != STATUS_BUFFER_OVERFLOW) lseek( fd, 1, SEEK_CUR ); + } + else io->u.Status = STATUS_NO_MORE_FILES; + } + } + else ret = -1; + +done: + RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + + TRACE("returning %d\n", ret); + + return ret; +} +#endif + /****************************************************************************** * NtQueryDirectoryFile [NTDLL.@] @@ -2173,9 +2244,15 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, if ((read_directory_vfat( fd, io, buffer, length, single_entry, mask, restart_scan, info_class )) != -1) goto done; #endif - if (!has_wildcard( mask ) && - read_directory_stat( fd, io, buffer, length, single_entry, + if (!has_wildcard( mask )) + { +#ifdef HAVE_GETATTRLIST + if (read_directory_getattrlist( fd, io, buffer, length, single_entry, mask, restart_scan, info_class ) != -1) goto done; +#endif + if (read_directory_stat( fd, io, buffer, length, single_entry, + mask, restart_scan, info_class ) != -1) goto done; + } #ifdef USE_GETDENTS if ((read_directory_getdents( fd, io, buffer, length, single_entry, mask, restart_scan, info_class )) != -1) goto done;

1 0

Matteo Bruni : ntdll: Ignore positive matches in read_directory_stat() for case-insensitive filesystems.
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: 2f0febe60a9f0b29840fc8d60679a8585b788ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0febe60a9f0b29840fc8d60… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 19 23:32:34 2015 +0200 ntdll: Ignore positive matches in read_directory_stat() for case-insensitive filesystems. It's necessary to return the actual filename with correct casing and a plain stat doesn't allow that. Make read_directory_stat() return the result of the stat() call on a case-insensitive filesystem only when the file is missing. --- dlls/ntdll/directory.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 81b5c2e..455fbc6 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2065,8 +2065,9 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG int unix_len, ret, used_default; char *unix_name; struct stat st; + BOOL case_sensitive = get_dir_case_sensitivity("."); - TRACE("trying optimisation for file %s\n", debugstr_us( mask )); + TRACE("looking up file %s\n", debugstr_us( mask )); unix_len = ntdll_wcstoumbs( 0, mask->Buffer, mask->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ); if (!(unix_name = RtlAllocateHeap( GetProcessHeap(), 0, unix_len + 1))) @@ -2091,7 +2092,7 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG } ret = stat( unix_name, &st ); - if (!ret) + if (case_sensitive && !ret) { union file_directory_info *info = append_entry( buffer, io, length, unix_name, NULL, NULL, class ); if (info) @@ -2101,6 +2102,19 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG } else io->u.Status = STATUS_NO_MORE_FILES; } + else if (!case_sensitive && ret && (errno == ENOENT || errno == ENOTDIR)) + { + /* If the file does not exist, return that info. + * If the file DOES exist, return failure and fallback to the next + * read_directory_* function (we need to return the case-preserved + * filename stored on the filesystem). */ + ret = 0; + io->u.Status = STATUS_NO_MORE_FILES; + } + else + { + ret = -1; + } } else ret = -1;

1 0

Nikolay Sivov : dwrite: Added IDWriteGlyphRunAnalysis stub.
by Alexandre Julliard 19 May '15

19 May '15

Module: wine Branch: master Commit: f4790714fe69df7701cff666d6b5ab4be049cbf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4790714fe69df7701cff666d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 19 15:23:57 2015 +0300 dwrite: Added IDWriteGlyphRunAnalysis stub. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 104 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 6 ++- dlls/dwrite/tests/font.c | 81 +++++++++++++++++++++++++++++++++ 4 files changed, 190 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index aa73b4b..cd6d08c 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -117,6 +117,7 @@ extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *refer extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; extern HRESULT create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2**) DECLSPEC_HIDDEN; extern HRESULT create_font_collection(IDWriteFactory2*,IDWriteFontFileEnumerator*,BOOL,IDWriteFontCollection**) DECLSPEC_HIDDEN; +extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DECLSPEC_HIDDEN; extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c591f4e..85b03f6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -97,6 +97,11 @@ struct dwrite_fonttable { UINT32 size; }; +struct dwrite_glyphrunanalysis { + IDWriteGlyphRunAnalysis IDWriteGlyphRunAnalysis_iface; + LONG ref; +}; + #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT) #define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1) @@ -155,6 +160,11 @@ static inline struct dwrite_fontcollection *impl_from_IDWriteFontCollection(IDWr return CONTAINING_RECORD(iface, struct dwrite_fontcollection, IDWriteFontCollection_iface); } +static inline struct dwrite_glyphrunanalysis *impl_from_IDWriteGlyphRunAnalysis(IDWriteGlyphRunAnalysis *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_glyphrunanalysis, IDWriteGlyphRunAnalysis_iface); +} + static HRESULT get_cached_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) { static const DWRITE_GLYPH_METRICS nil; @@ -2569,3 +2579,97 @@ HRESULT get_local_refkey(const WCHAR *path, const FILETIME *writetime, void **ke return S_OK; } + +/* IDWriteGlyphRunAnalysis */ +static HRESULT WINAPI glyphrunanalysis_QueryInterface(IDWriteGlyphRunAnalysis *iface, REFIID riid, void **ppv) +{ + struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IDWriteGlyphRunAnalysis) || + IsEqualIID(riid, &IID_IUnknown)) + { + *ppv = iface; + IDWriteGlyphRunAnalysis_AddRef(iface); + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI glyphrunanalysis_AddRef(IDWriteGlyphRunAnalysis *iface) +{ + struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI glyphrunanalysis_Release(IDWriteGlyphRunAnalysis *iface) +{ + struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (!ref) { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnalysis *iface, DWRITE_TEXTURE_TYPE type, RECT* bounds) +{ + struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); + FIXME("(%p)->(%d %p): stub\n", This, type, bounds); + return E_NOTIMPL; +} + +static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysis *iface, DWRITE_TEXTURE_TYPE type, + RECT const* bounds, BYTE* alphaValues, UINT32 bufferSize) +{ + struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); + FIXME("(%p)->(%d %p %p %u): stub\n", This, type, bounds, alphaValues, bufferSize); + return E_NOTIMPL; +} + +static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalysis *iface, IDWriteRenderingParams *params, + FLOAT *blendGamma, FLOAT *blendEnhancedContrast, FLOAT *blendClearTypeLevel) +{ + struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); + FIXME("(%p)->(%p %p %p %p): stub\n", This, params, blendGamma, blendEnhancedContrast, blendClearTypeLevel); + return E_NOTIMPL; +} + +static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { + glyphrunanalysis_QueryInterface, + glyphrunanalysis_AddRef, + glyphrunanalysis_Release, + glyphrunanalysis_GetAlphaTextureBounds, + glyphrunanalysis_CreateAlphaTexture, + glyphrunanalysis_GetAlphaBlendParams +}; + +HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, IDWriteGlyphRunAnalysis **ret) +{ + struct dwrite_glyphrunanalysis *analysis; + + *ret = NULL; + + /* check for valid rendering mode */ + if ((UINT32)rendering_mode >= DWRITE_RENDERING_MODE_OUTLINE || rendering_mode == DWRITE_RENDERING_MODE_DEFAULT) + return E_INVALIDARG; + + analysis = heap_alloc(sizeof(*analysis)); + if (!analysis) + return E_OUTOFMEMORY; + + analysis->IDWriteGlyphRunAnalysis_iface.lpVtbl = &glyphrunanalysisvtbl; + analysis->ref = 1; + + *ret = &analysis->IDWriteGlyphRunAnalysis_iface; + return S_OK; +} diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 3285f2d..20f9d36 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1075,9 +1075,11 @@ static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory2 *ifac DWRITE_MEASURING_MODE measuring_mode, FLOAT baseline_x, FLOAT baseline_y, IDWriteGlyphRunAnalysis **analysis) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - FIXME("(%p)->(%p %f %p %d %d %f %f %p): stub\n", This, glyph_run, pixels_per_dip, transform, rendering_mode, + + TRACE("(%p)->(%p %f %p %d %d %f %f %p)\n", This, glyph_run, pixels_per_dip, transform, rendering_mode, measuring_mode, baseline_x, baseline_y, analysis); - return E_NOTIMPL; + + return create_glyphrunanalysis(rendering_mode, analysis); } static HRESULT WINAPI dwritefactory1_GetEudcFontCollection(IDWriteFactory2 *iface, IDWriteFontCollection **collection, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 126fba9..1815105 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -70,6 +70,37 @@ static IDWriteFactory *create_factory(void) return factory; } +static IDWriteFontFace *create_fontface(IDWriteFactory *factory) +{ + static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; + IDWriteGdiInterop *interop; + IDWriteFontFace *fontface; + IDWriteFont *font; + LOGFONTW logfont; + HRESULT hr; + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, tahomaW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDWriteFont_Release(font); + IDWriteGdiInterop_Release(interop); + + return fontface; +} + static WCHAR *create_testfontfile(const WCHAR *filename) { static WCHAR pathW[MAX_PATH]; @@ -3238,6 +3269,55 @@ static void test_CreateRenderingParams(void) IDWriteFactory_Release(factory); } +static void test_CreateGlyphRunAnalysis(void) +{ + IDWriteGlyphRunAnalysis *analysis; + IDWriteFactory *factory; + DWRITE_GLYPH_RUN run; + IDWriteFontFace *face; + UINT16 index; + FLOAT advance; + HRESULT hr; + UINT32 ch; + + factory = create_factory(); + face = create_fontface(factory); + + ch = 'A'; + hr = IDWriteFontFace_GetGlyphIndices(face, &ch, 1, &index); + ok(hr == S_OK, "got 0x%08x\n", hr); + + run.fontFace = face; + run.fontEmSize = 24.0; + run.glyphCount = 1; + run.glyphIndices = &index; + run.glyphAdvances = &advance; + run.glyphOffsets = NULL; + run.isSideways = FALSE; + run.bidiLevel = 0; + + /* default mode is not allowed */ + hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, NULL, + DWRITE_RENDERING_MODE_DEFAULT, DWRITE_MEASURING_MODE_NATURAL, + 0.0, 0.0, &analysis); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* outline too */ + hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, NULL, + DWRITE_RENDERING_MODE_OUTLINE, DWRITE_MEASURING_MODE_NATURAL, + 0.0, 0.0, &analysis); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, NULL, + DWRITE_RENDERING_MODE_GDI_CLASSIC, DWRITE_MEASURING_MODE_NATURAL, + 0.0, 0.0, &analysis); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteGlyphRunAnalysis_Release(analysis); + + IDWriteFontFace_Release(face); + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -3280,6 +3360,7 @@ START_TEST(font) test_GetGlyphCount(); test_GetKerningPairAdjustments(); test_CreateRenderingParams(); + test_CreateGlyphRunAnalysis(); IDWriteFactory_Release(factory); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 19 May '15

19 May '15

Module: wine Branch: master Commit: 97bfece7cc445c347e0d0c534b7527cdfc88979f URL: http://source.winehq.org/git/wine.git/?a=commit;h=97bfece7cc445c347e0d0c534… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon May 18 16:30:25 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/po/lt.po b/po/lt.po index 695e5d0..4f1af92 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-05-08 14:01+0300\n" +"PO-Revision-Date: 2015-05-18 16:29+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8889,15 +8889,11 @@ msgstr "" "vietos, ar vis dar prisijungę prie tinklo." #: winmm.rc:85 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." msgstr "" -"Nepavyko rasti nurodyto įrenginio. Įsitikinkite, kad jis įdiegtas ir ar " +"Nepavyko rasti nurodyto įrenginio. Įsitikinkite, kad jis įdiegtas ir " "teisingai įrašytas įrenginio vardas." #: winmm.rc:86

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 19 May '15

19 May '15

Module: wine Branch: master Commit: ed318c91f2edae0b37c6a9483eae05c9f594dea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed318c91f2edae0b37c6a9483… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 18 21:20:23 2015 +0300 po: Update Russian translation. --- po/ru.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/ru.po b/po/ru.po index ef5ab17..32855da 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-10-06 21:40+0400\n" +"PO-Revision-Date: 2015-05-18 19:06+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -8889,16 +8889,12 @@ msgstr "" "места, или проверьте сетевое подключение." #: winmm.rc:85 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." msgstr "" -"Невозможно найти указанное устройство. Убедитесь, что оно установлено, и что " -"устройство указано правильно." +"Невозможно найти указанное устройство. Убедитесь, что оно установлено и его " +"имя указано правильно." #: winmm.rc:86 msgid ""

1 0

Andrew Eikum : winealsa.drv: Default to Stereo instead of 5.1 Surround.
by Alexandre Julliard 19 May '15

19 May '15

Module: wine Branch: master Commit: b8753ada42562a4648b80ab5bd941495de0319ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8753ada42562a4648b80ab5b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 18 11:38:01 2015 -0500 winealsa.drv: Default to Stereo instead of 5.1 Surround. Some popular ALSA plugins claim support for a large number of channels because they have the capability to mix that down to the actual hardware configuration. Instead of defaulting to 5.1 Surround sound for these plugins, let's fall back on the much more common Stereo configuration. Users with actual 5.1 Surround setups can tell us about it in winecfg. --- dlls/winealsa.drv/mmdevdrv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 90894b6..14eac39 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1828,7 +1828,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, } if(max_channels > 6) - fmt->Format.nChannels = 6; + fmt->Format.nChannels = 2; else fmt->Format.nChannels = max_channels; @@ -4068,7 +4068,9 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI out->vt = VT_UI4; - if (num_speakers >= 6) + if (num_speakers > 6) + out->u.ulVal = KSAUDIO_SPEAKER_STEREO; + else if (num_speakers == 6) out->u.ulVal = KSAUDIO_SPEAKER_5POINT1; else if (num_speakers >= 4) out->u.ulVal = KSAUDIO_SPEAKER_QUAD;

1 0