wine-commits October 2014

wine-commits@winehq.org

2 participants
397 discussions

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_P8.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: e10a46c30006d90dae9190b0ffb3985a7b3fc6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10a46c30006d90dae9190b0f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:39 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_P8. --- dlls/wined3d/surface.c | 87 ++++++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cf057e2..0f13c9d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3156,9 +3156,47 @@ static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD colo && color <= color_key->color_space_high_value; } +static void convert_p8_uint_b8g8r8a8_unorm(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) +{ + const BYTE *src_row; + unsigned int x, y; + DWORD *dst_row; + + if (!palette) + { + /* FIXME: This should probably use the system palette. */ + FIXME("P8 surface loaded without a palette.\n"); + + for (y = 0; y < height; ++y) + { + memset(&dst[dst_pitch * y], 0, width * 4); + } + + return; + } + + for (y = 0; y < height; ++y) + { + src_row = &src[src_pitch * y]; + dst_row = (DWORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + BYTE src_color = src_row[x]; + dst_row[x] = 0xff000000 + | (palette->colors[src_color].rgbRed << 16) + | (palette->colors[src_color].rgbGreen << 8) + | palette->colors[src_color].rgbBlue; + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { + struct wined3d_palette *palette = NULL; + struct wined3d_texture *texture; const BYTE *source; unsigned int x, y; BYTE *dest; @@ -3166,43 +3204,14 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI TRACE("src %p, dst %p, pitch %u, width %u, height %u, outpitch %u, conversion_type %#x, surface %p.\n", src, dst, pitch, width, height, outpitch, conversion_type, surface); + texture = surface->container; switch (conversion_type) { case WINED3D_CT_P8: - if (surface->container->swapchain && surface->container->swapchain->palette) - { - const struct wined3d_palette *palette = surface->container->swapchain->palette; - for (y = 0; y < height; y++) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; x++) - { - BYTE color = *source++; - *dest++ = palette->colors[color].rgbBlue; - *dest++ = palette->colors[color].rgbGreen; - *dest++ = palette->colors[color].rgbRed; - *dest++ = 0; - } - } - } - else - { - /* This should probably use the system palette, but unless - * the X server is running in P8 mode there is no such thing. - * The probably best solution is to set the fixed 20 colors - * from the default windows palette and set the rest to black, - * white, or some ugly pink. For now use black for the entire - * palette. Don't use pink everywhere. Age of Empires 2 draws - * a front buffer filled with zeroes without a palette when - * starting and we don't want the screen to flash in an ugly - * color. */ - FIXME("P8 surface loaded without a palette.\n"); - for (y = 0; y < height; ++y) - { - memset(&dst[outpitch * y], 0, width * 4); - } - } + if (texture->swapchain && texture->swapchain->palette) + palette = texture->swapchain->palette; + convert_p8_uint_b8g8r8a8_unorm(src, pitch, dst, outpitch, + width, height, palette, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B5G6R5: @@ -3213,7 +3222,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { WORD color = *(const WORD *)source; - if (!color_in_range(&surface->container->src_blt_color_key, color)) + if (!color_in_range(&texture->src_blt_color_key, color)) *(WORD *)dest = 0x8000 | ((color & 0xffc0) >> 1) | (color & 0x1f); else *(WORD *)dest = ((color & 0xffc0) >> 1) | (color & 0x1f); @@ -3235,7 +3244,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++ ) { WORD color = *Source++; *Dest = color; - if (!color_in_range(&surface->container->src_blt_color_key, color)) + if (!color_in_range(&texture->src_blt_color_key, color)) *Dest |= (1 << 15); else *Dest &= ~(1 << 15); @@ -3253,7 +3262,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { DWORD color = ((DWORD)source[2] << 16) | ((DWORD)source[1] << 8) | (DWORD)source[0]; - if (!color_in_range(&surface->container->src_blt_color_key, color)) + if (!color_in_range(&texture->src_blt_color_key, color)) color |= 0xff000000; *(DWORD *)dest = color; source += 3; @@ -3270,7 +3279,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { DWORD color = *(const DWORD *)source; - if (color_in_range(&surface->container->src_blt_color_key, color)) + if (color_in_range(&texture->src_blt_color_key, color)) *(DWORD *)dest = color & ~0xff000000; else *(DWORD *)dest = color | 0xff000000; @@ -3288,7 +3297,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { DWORD color = *(const DWORD *)source; - if (color_in_range(&surface->container->src_blt_color_key, color)) + if (color_in_range(&texture->src_blt_color_key, color)) color &= ~0xff000000; *(DWORD*)dest = color; source += 4;

1 0

Henri Verbeet : wined3d: Just store the wined3d format in color_key_info[] .
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: 5802f72adfad0ef5bebc139a3775bc35c4274bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5802f72adfad0ef5bebc139a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:38 2014 +0200 wined3d: Just store the wined3d format in color_key_info[]. --- dlls/wined3d/surface.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a4a11c1..cf057e2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1591,28 +1591,28 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp BOOL colorkey_active = need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT); const struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_format *dst_format; + enum wined3d_format_id dst_format_id; unsigned int i; static const struct { enum wined3d_format_id src_format; enum wined3d_conversion_type conversion_type; - GLint gl_internal; - GLint gl_format; - GLint gl_type; - unsigned int conv_byte_count; + enum wined3d_format_id dst_format; } color_key_info[] = { - {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, - {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, - {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, - {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, - {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, + {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, WINED3DFMT_B5G5R5A1_UNORM}, + {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, WINED3DFMT_B5G5R5A1_UNORM}, + {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, WINED3DFMT_B8G8R8A8_UNORM}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, WINED3DFMT_B8G8R8A8_UNORM}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, WINED3DFMT_B8G8R8A8_UNORM}, }; *format = *texture->resource.format; *conversion_type = WINED3D_CT_NONE; + dst_format_id = format->id; if (colorkey_active) { @@ -1622,10 +1622,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp continue; *conversion_type = color_key_info[i].conversion_type; - format->glInternal = color_key_info[i].gl_internal; - format->glFormat = color_key_info[i].gl_format; - format->glType = color_key_info[i].gl_type; - format->conv_byte_count = color_key_info[i].conv_byte_count; + dst_format_id = color_key_info[i].dst_format; break; } } @@ -1638,10 +1635,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp && texture == texture->swapchain->front_buffer)) || colorkey_active) { *conversion_type = WINED3D_CT_P8; - format->glInternal = GL_RGBA8; - format->glFormat = GL_BGRA; - format->glType = GL_UNSIGNED_INT_8_8_8_8_REV; - format->conv_byte_count = 4; + dst_format_id = WINED3DFMT_B8G8R8A8_UNORM; } } else if (texture->resource.format->id == WINED3DFMT_B2G3R3_UNORM && colorkey_active) @@ -1653,8 +1647,13 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp if (*conversion_type != WINED3D_CT_NONE) { - format->rtInternal = format->glInternal; + dst_format = wined3d_get_format(gl_info, dst_format_id); + format->glInternal = dst_format->glInternal; format->glGammaInternal = format->glInternal; + format->rtInternal = format->glInternal; + format->glFormat = dst_format->glFormat; + format->glType = dst_format->glType; + format->conv_byte_count = dst_format->byte_count; } }

1 0

Henri Verbeet : wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8X8.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: 2c7be38bb4079aab316dd5efe0306bb79344ce7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c7be38bb4079aab316dd5efe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:37 2014 +0200 wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8X8. --- dlls/wined3d/surface.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 73b872f..a4a11c1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1607,7 +1607,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, - {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, }; @@ -3264,17 +3264,17 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8X8: - /* Converting X8R8G8B8 format to R8G8B8A8 with color-keying. */ - for (y = 0; y < height; y++) + for (y = 0; y < height; ++y) { source = src + pitch * y; dest = dst + outpitch * y; - for (x = 0; x < width; x++) { - DWORD color = 0xffffff & *(const DWORD*)source; - DWORD dstcolor = color << 8; - if (!color_in_range(&surface->container->src_blt_color_key, color)) - dstcolor |= 0xff; - *(DWORD*)dest = dstcolor; + for (x = 0; x < width; ++x) + { + DWORD color = *(const DWORD *)source; + if (color_in_range(&surface->container->src_blt_color_key, color)) + *(DWORD *)dest = color & ~0xff000000; + else + *(DWORD *)dest = color | 0xff000000; source += 4; dest += 4; }

1 0

André Hentschel : Fix typo in WWN 376
by Jeremy Newman 02 Oct '14

02 Oct '14

Module: website Branch: master Commit: bf6418c402ead5fd3b9fe425545eecdc27577758 URL: http://source.winehq.org/git/website.git/?a=commit;h=bf6418c402ead5fd3b9fe4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 2 00:25:19 2014 +0200 Fix typo in WWN 376 --- wwn/en/wn20140930_376.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wwn/en/wn20140930_376.xml b/wwn/en/wn20140930_376.xml index 9dccc7f..20b123f 100644 --- a/wwn/en/wn20140930_376.xml +++ b/wwn/en/wn20140930_376.xml @@ -28,7 +28,7 @@ Its main goal is to inform you of what's going on around Wine. Wine is an open s posts="0" > -As you might have seen in <a href="//www.winehq.org/wwn/375">WWN 375</a>, Kai Tietz and I are working on MinGW-w64 targeting ARMv7. +As you might have seen in <a href="//www.winehq.org/wwn/369">WWN 369</a>, Kai Tietz and I are working on MinGW-w64 targeting ARMv7. Meanwhile I finished porting the CRT, but after a hackathon last week, we found out that we ran into a chicken-egg situation. @@ -49,7 +49,7 @@ After that the work on libgcc can begin and then we need to get a lot of things > Jacek Caban, who maintains the wine-gecko code, wrote to <a href="//www.winehq.org/pipermail/wine-devel/2014-September/105276.html">wine-devel</a> about an upcoming -wine-gecko version and why it took so long after the last release. +wine-gecko version and why it took so long after the last release. Happy testing! </section>

1 0

Alexandre Julliard : kernel32/tests: Fix overlapped status checks for 64-bit.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 5afbb6ba9e958ca21d03093165a85884827fe748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afbb6ba9e958ca21d0309316… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 1 21:14:24 2014 +0200 kernel32/tests: Fix overlapped status checks for 64-bit. --- dlls/kernel32/tests/change.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 9226950..ad22f18 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -472,7 +472,7 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -502,7 +502,7 @@ static void test_readdirectorychanges(void) r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); - ok( ov.Internal == STATUS_PENDING, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_PENDING, "ov.Internal wrong\n"); ok( ov.InternalHigh == 1, "ov.InternalHigh wrong\n"); r = WaitForSingleObject( ov.hEvent, 0 ); @@ -514,10 +514,10 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); - if (ov.Internal == STATUS_SUCCESS) + if ((NTSTATUS)ov.Internal == STATUS_SUCCESS) { r = GetOverlappedResult( hdir, &ov, &dwCount, TRUE ); ok( r == TRUE, "getoverlappedresult failed\n"); @@ -540,7 +540,7 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); /* test the recursive watch */ @@ -553,7 +553,7 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x18, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -589,7 +589,7 @@ static void test_readdirectorychanges(void) ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong %u\n", pfni->FileNameLength ); ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); dwCount = (char *)&pfni->FileName[pfni->FileNameLength/sizeof(WCHAR)] - buffer; ok( ov.InternalHigh == dwCount, "ov.InternalHigh wrong %lu/%u\n",ov.InternalHigh, dwCount ); @@ -666,7 +666,7 @@ static void test_readdirectorychanges_null(void) r = WaitForSingleObject( ov.hEvent, 0 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); - ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); ov.Internal = 0; @@ -687,7 +687,7 @@ static void test_readdirectorychanges_null(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -763,7 +763,7 @@ static void test_readdirectorychanges_filedir(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer;

1 0

Nikolay Sivov : usp10: Remove comment that's no longer true.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 5281bff120fa377703948945201dc63bb97392b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5281bff120fa3777039489452… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 1 18:34:44 2014 +0400 usp10: Remove comment that's no longer true. --- dlls/usp10/usp10.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8769bd9..6aa6b3e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3407,10 +3407,6 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB * Success: S_OK * Failure: Non-zero HRESULT value. * - * BUGS - * This stub works correctly for any sequence of a single - * embedding level but not for sequences of different - * embedding levels, i.e. mixtures of RTL and LTR scripts. */ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *logtovis) {

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 9e312d34f13fb8e7da220824f384c54aaac34b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e312d34f13fb8e7da220824f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Oct 1 17:22:21 2014 +0300 po: Update Finnish translation. --- po/fi.po | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/po/fi.po b/po/fi.po index 01c6443..88fd213 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3534,16 +3534,12 @@ msgid "Expected ')'" msgstr "Odotettiin merkkiä ')'" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Haltijan avaimen tunniste" +msgstr "Odotettiin tunnistetta" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "Odotettiin merkkiä ';'" +msgstr "Odotettiin merkkiä '='" #: jscript.rc:42 msgid "Invalid character" @@ -3574,20 +3570,16 @@ msgid "Label not found" msgstr "Nimiötä ei löydy" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "Odotettiin merkkiä ';'" +msgstr "Odotettiin sanaa '@end'" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "Ehdollinen kääntäminen on pois käytöstä" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "Odotettiin merkkiä ';'" +msgstr "Odotettiin merkkiä '@'" #: jscript.rc:54 msgid "Number expected"

1 0

Joris van der Wel : server: A new function "set_sd_defaults_from_token".
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 6d19aa83bf2f302f7a658f48cb326e167b48c645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d19aa83bf2f302f7a658f48c… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Wed Sep 17 15:35:26 2014 +0200 server: A new function "set_sd_defaults_from_token". --- server/object.c | 25 ++++++++++++++++--------- server/object.h | 2 ++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/server/object.c b/server/object.c index 11ef0ce..ec196c1 100644 --- a/server/object.c +++ b/server/object.c @@ -423,12 +423,12 @@ struct security_descriptor *default_get_sd( struct object *obj ) return obj->sd; } -int default_set_sd( struct object *obj, const struct security_descriptor *sd, - unsigned int set_info ) +int set_sd_defaults_from_token( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info, struct token *token ) { struct security_descriptor new_sd, *new_sd_ptr; int present; - const SID *owner, *group; + const SID *owner = NULL, *group = NULL; const ACL *sacl, *dacl; char *ptr; @@ -446,9 +446,9 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, owner = sd_get_owner( obj->sd ); new_sd.owner_len = obj->sd->owner_len; } - else + else if (token) { - owner = token_get_user( current->process->token ); + owner = token_get_user( token ); new_sd.owner_len = security_sid_len( owner ); } @@ -462,9 +462,9 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, group = sd_get_group( obj->sd ); new_sd.group_len = obj->sd->group_len; } - else + else if (token) { - group = token_get_primary_group( current->process->token ); + group = token_get_primary_group( token ); new_sd.group_len = security_sid_len( group ); } @@ -494,9 +494,9 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, if (obj->sd && present) new_sd.dacl_len = obj->sd->dacl_len; - else + else if (token) { - dacl = token_get_default_dacl( current->process->token ); + dacl = token_get_default_dacl( token ); new_sd.dacl_len = dacl->AclSize; } } @@ -521,6 +521,13 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, return 1; } +/** Set the security descriptor using the current primary token for defaults. */ +int default_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ) +{ + return set_sd_defaults_from_token( obj, sd, set_info, current->process->token ); +} + struct object *no_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { diff --git a/server/object.h b/server/object.h index bb3ff21..dd93b76e 100644 --- a/server/object.h +++ b/server/object.h @@ -139,6 +139,8 @@ extern struct fd *no_get_fd( struct object *obj ); extern unsigned int no_map_access( struct object *obj, unsigned int access ); extern struct security_descriptor *default_get_sd( struct object *obj ); extern int default_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); +extern int set_sd_defaults_from_token( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info, struct token *token ); extern struct object *no_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attributes ); extern struct object *no_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options );

1 0

Shuai Meng : vbscript: Implemented RGB.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 0480bbfb343e5fce6004366e85a0ab5269ad0fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0480bbfb343e5fce6004366e8… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue Sep 30 18:31:08 2014 +0800 vbscript: Implemented RGB. --- dlls/vbscript/global.c | 20 ++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 22 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 2901623..93fdcc3 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -778,8 +778,24 @@ static HRESULT Global_UBound(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA static HRESULT Global_RGB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + int i, color[3]; + + TRACE("%s %s %s\n", debugstr_variant(arg), debugstr_variant(arg + 1), debugstr_variant(arg + 2)); + + assert(args_cnt == 3); + + for(i = 0; i < 3; i++) { + hres = to_int(arg + i, color + i); + if(FAILED(hres)) + return hres; + if(color[i] > 255) + color[i] = 255; + if(color[i] < 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + } + + return return_int(res, RGB(color[0], color[1], color[2])); } static HRESULT Global_Len(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 9e64412..e2efa98 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1242,4 +1242,26 @@ Call ok(getVT(Log(CByte(2))) = "VT_R8", "getVT(Log(CByte(2))) = " & getVT(Log(CB Call ok(getVT(Date) = "VT_DATE", "getVT(Date) = " & getVT(Date)) Call ok(getVT(Time) = "VT_DATE", "getVT(Time) = " & getVT(Time)) +Sub testRGBError(arg1, arg2, arg3, error_num) + on error resume next + Dim x + + Call Err.clear() + x = RGB(arg1, arg2, arg3) + Call ok(Err.number = error_num, "Err.number1 = " & Err.number) + + Call Err.clear() + Call RGB(arg1, arg2, arg3) + Call ok(Err.number = error_num, "Err.number2 = " & Err.number) +End Sub + +Call ok(RGB(0, &h1f&, &hf1&) = &hf11f00&, "RGB(0, &h1f&, &hf1&) = " & RGB(0, &h1f&, &hf1&)) +Call ok(getVT(RGB(0, &h1f&, &hf1&)) = "VT_I4", "getVT(RGB(&hf1&, &h1f&, &hf1&)) = " & getVT(RGB(&hf1&, &h1f&, &hf1&))) +Call ok(RGB(&hef&, &hab&, &hcd&) = &hcdabef&, "RGB(&hef&, &hab&, &hcd&) = " & RGB(&hef&, &hab&, &hcd&)) +Call ok(getVT(RGB(&hef&, &hab&, &hcd&)) = "VT_I4", "getVT(RGB(&hef&, &hab&, &hcd&)) = " & getVT(RGB(&hef&, &hab&, &hcd&))) +Call ok(RGB(&h1&, &h100&, &h111&) = &hffff01&, "RGB(&h1&, &h100&, &h111&) = " & RGB(&h1&, &h100&, &h111&)) +Call ok(getVT(RGB(&h1&, &h100&, &h111&)) = "VT_I4", "getVT(RGB(&h1&, &h100&, &h111&)) = " & getVT(RGB(&h1&, &h100&, &h111&))) +Call testRGBError(-1, &h1e&, &h3b&, 5) +Call testRGBError(&h4d&, -2, &h2f&, 5) + Call reportSuccess()

1 0

Nikolay Sivov : dwrite: Implement AnalyzeBidi().
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: fdd8454ef8fe41a1e695f8b9640d8b3f77a8e6da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd8454ef8fe41a1e695f8b96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 30 09:56:39 2014 +0400 dwrite: Implement AnalyzeBidi(). --- dlls/dwrite/Makefile.in | 2 + dlls/dwrite/analyzer.c | 83 +++- dlls/dwrite/bidi.c | 1130 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/bracket.c | 106 ++++ dlls/dwrite/dwrite_private.h | 7 + tools/make_unicode | 1 + 6 files changed, 1322 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdd8454ef8fe41a1e695f…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2014