wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Henri Verbeet : wined3d: Make the context parameter to bind_dummy_textures( ) const.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 96187a54a99257417fac4846dc0f1ef6c8641295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96187a54a99257417fac4846d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 23 18:24:00 2011 +0200 wined3d: Make the context parameter to bind_dummy_textures() const. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2c26728..2742b54 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1282,7 +1282,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC } /* GL locking is done by the caller */ -static void bind_dummy_textures(const struct wined3d_device *device, struct wined3d_context *context) +static void bind_dummy_textures(const struct wined3d_device *device, const struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i, count = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers);

1 0

Henri Verbeet : wined3d: Get rid of surface_gdi_cleanup().
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: e6101816a236e9ecd735abeda9f7c7c88773e8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6101816a236e9ecd735abeda… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 23 18:23:59 2011 +0200 wined3d: Get rid of surface_gdi_cleanup(). It's effectively the same as surface_cleanup(). The GL objects that surface_cleanup() destroys are never created for "GDI" surfaces. --- dlls/wined3d/surface.c | 39 ++------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7b17e2f..7dfc5b1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1962,7 +1962,6 @@ static const struct wined3d_resource_ops surface_resource_ops = static const struct wined3d_surface_ops surface_ops = { surface_private_setup, - surface_cleanup, surface_realize_palette, surface_draw_overlay, surface_preload, @@ -2015,39 +2014,6 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) return WINED3D_OK; } -static void surface_gdi_cleanup(struct wined3d_surface *surface) -{ - struct wined3d_surface *overlay, *cur; - - TRACE("surface %p.\n", surface); - - if (surface->flags & SFLAG_DIBSECTION) - { - /* Release the DC. */ - SelectObject(surface->hDC, surface->dib.holdbitmap); - DeleteDC(surface->hDC); - /* Release the DIB section. */ - DeleteObject(surface->dib.DIBsection); - surface->dib.bitmap_data = NULL; - surface->resource.allocatedMemory = NULL; - } - - if (surface->flags & SFLAG_USERPTR) - wined3d_surface_set_mem(surface, NULL); - if (surface->overlay_dest) - list_remove(&surface->overlay_entry); - - LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &surface->overlays, struct wined3d_surface, overlay_entry) - { - list_remove(&overlay->overlay_entry); - overlay->overlay_dest = NULL; - } - - HeapFree(GetProcessHeap(), 0, surface->palette9); - - resource_cleanup(&surface->resource); -} - static void gdi_surface_realize_palette(struct wined3d_surface *surface) { struct wined3d_palette *palette = surface->palette; @@ -2155,7 +2121,6 @@ static HRESULT gdi_surface_getdc(struct wined3d_surface *surface) static const struct wined3d_surface_ops gdi_surface_ops = { gdi_surface_private_setup, - surface_gdi_cleanup, gdi_surface_realize_palette, gdi_surface_draw_overlay, gdi_surface_preload, @@ -2915,7 +2880,7 @@ ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) if (!refcount) { - surface->surface_ops->surface_cleanup(surface); + surface_cleanup(surface); surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent); TRACE("Destroyed surface %p.\n", surface); @@ -7214,7 +7179,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, WINED3DSURFTYPE sur if (FAILED(hr)) { ERR("Private setup failed, returning %#x\n", hr); - surface->surface_ops->surface_cleanup(surface); + surface_cleanup(surface); return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebe277b..e2fd75e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1990,7 +1990,6 @@ struct wined3d_subresource_container struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct wined3d_surface *surface); - void (*surface_cleanup)(struct wined3d_surface *surface); void (*surface_realize_palette)(struct wined3d_surface *surface); HRESULT (*surface_draw_overlay)(struct wined3d_surface *surface); void (*surface_preload)(struct wined3d_surface *surface);

1 0

Henri Verbeet : wined3d: Reject multisampled readbacks in wined3d_surface_get_render_target_data().
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 6e8273177a47cd98fc4d6b4b293260b79ef19b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8273177a47cd98fc4d6b4b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 23 18:23:58 2011 +0200 wined3d: Reject multisampled readbacks in wined3d_surface_get_render_target_data(). --- dlls/d3d9/device.c | 3 +-- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/surface.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0372239..4768ece 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -971,8 +971,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTargetData(IDirect3DDevice9E TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, pRenderTarget, pDestSurface); wined3d_mutex_lock(); - hr = wined3d_surface_bltfast(destSurface->wined3d_surface, 0, 0, - renderTarget->wined3d_surface, NULL, WINEDDBLTFAST_NOCOLORKEY); + hr = wined3d_surface_get_render_target_data(destSurface->wined3d_surface, renderTarget->wined3d_surface); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c583b12..2d651bf 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12644,7 +12644,7 @@ static void multisample_get_rtdata_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); hr = IDirect3DDevice9_GetRenderTargetData(device, rt, readback); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, original_ds); ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 54b46b1..7b17e2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1826,6 +1826,19 @@ HRESULT CDECL wined3d_surface_bltfast(struct wined3d_surface *dst_surface, DWORD return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, NULL, WINED3DTEXF_POINT); } +HRESULT CDECL wined3d_surface_get_render_target_data(struct wined3d_surface *surface, + struct wined3d_surface *render_target) +{ + TRACE("surface %p, render_target %p.\n", surface, render_target); + + /* TODO: Check surface sizes, pools, etc. */ + + if (render_target->resource.multisample_type) + return WINED3DERR_INVALIDCALL; + + return wined3d_surface_blt(surface, NULL, render_target, NULL, 0, NULL, WINED3DTEXF_POINT); +} + /* Context activation is done by the caller. */ static void surface_remove_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6af4d3c..9cac395 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -212,6 +212,7 @@ @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_get_priority(ptr) +@ cdecl wined3d_surface_get_render_target_data(ptr ptr) @ cdecl wined3d_surface_get_resource(ptr) @ cdecl wined3d_surface_getdc(ptr ptr) @ cdecl wined3d_surface_incref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e4ca4c4..a67949b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2428,6 +2428,8 @@ struct wined3d_palette * __cdecl wined3d_surface_get_palette(const struct wined3 void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_priority(const struct wined3d_surface *surface); +HRESULT __cdecl wined3d_surface_get_render_target_data(struct wined3d_surface *surface, + struct wined3d_surface *render_target); struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc); ULONG __cdecl wined3d_surface_incref(struct wined3d_surface *surface);

1 0

Henri Verbeet : wined3d: Only try to load surfaces from the drawable if the drawable is current in surface_load_sysmem ().
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 4229d865d27dd81c23c8bbb72cd834cf0d659609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4229d865d27dd81c23c8bbb72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 23 18:23:57 2011 +0200 wined3d: Only try to load surfaces from the drawable if the drawable is current in surface_load_sysmem(). --- dlls/wined3d/surface.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 54cacbd..54b46b1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5809,9 +5809,15 @@ static void surface_load_sysmem(struct wined3d_surface *surface, return; } - /* Note: It might be faster to download into a texture first. */ - read_from_framebuffer(surface, rect, surface->resource.allocatedMemory, - wined3d_surface_get_pitch(surface)); + if (surface->flags & SFLAG_INDRAWABLE) + { + read_from_framebuffer(surface, rect, surface->resource.allocatedMemory, + wined3d_surface_get_pitch(surface)); + return; + } + + FIXME("Can't load surface %p with location flags %#x into sysmem.\n", + surface, surface->flags & SFLAG_LOCATIONS); } static HRESULT surface_load_drawable(struct wined3d_surface *surface,

1 0

Juan Lang : wininet: Accept RFC 850 dates in HTTP headers.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: aeca2f98fa6086b0a83d9acece336e91a6a6df6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeca2f98fa6086b0a83d9acec… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 21 22:55:14 2011 -0700 wininet: Accept RFC 850 dates in HTTP headers. --- dlls/wininet/http.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 134 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 50630ba..d1a870b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3989,7 +3989,7 @@ static void HTTP_InsertCookies(http_request_t *request) heap_free(cookies); } -static WORD HTTP_ParseDay(LPCWSTR day) +static WORD HTTP_ParseWkday(LPCWSTR day) { static const WCHAR days[7][4] = {{ 's','u','n',0 }, { 'm','o','n',0 }, @@ -4107,7 +4107,7 @@ static BOOL HTTP_ParseDateAsAsctime(LPCWSTR value, FILETIME *ft) dayPtr - day < sizeof(day) / sizeof(day[0]) - 1; ptr++, dayPtr++) *dayPtr = *ptr; *dayPtr = 0; - st.wDayOfWeek = HTTP_ParseDay(day); + st.wDayOfWeek = HTTP_ParseWkday(day); if (st.wDayOfWeek >= 7) { ERR("unexpected weekday %s\n", debugstr_w(day)); @@ -4186,15 +4186,15 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) return FALSE; if (ptr - value != 3) { - ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + WARN("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); return FALSE; } memcpy(day, value, (ptr - value) * sizeof(WCHAR)); day[3] = 0; - st.wDayOfWeek = HTTP_ParseDay(day); + st.wDayOfWeek = HTTP_ParseWkday(day); if (st.wDayOfWeek > 6) { - ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + WARN("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); return FALSE; } ptr++; @@ -4205,7 +4205,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) num = strtoulW(ptr, &nextPtr, 10); if (!nextPtr || nextPtr <= ptr || !num || num > 31) { - ERR("unexpected day %s\n", debugstr_w(value)); + WARN("unexpected day %s\n", debugstr_w(value)); return FALSE; } ptr = nextPtr; @@ -4222,7 +4222,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) st.wMonth = HTTP_ParseMonth(month); if (!st.wMonth || st.wMonth > 12) { - ERR("unexpected month %s\n", debugstr_w(month)); + WARN("unexpected month %s\n", debugstr_w(month)); return FALSE; } @@ -4252,11 +4252,125 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) return SystemTimeToFileTime(&st, ft); } -/* FIXME: only accepts dates in RFC 1123 format and asctime() format, - * which may not be the only formats actually seen in the wild. - * http://www.hackcraft.net/web/datetime/ suggests at least RFC 850 dates - * should be accepted as well. - */ +static WORD HTTP_ParseWeekday(LPCWSTR day) +{ + static const WCHAR days[7][10] = {{ 's','u','n','d','a','y',0 }, + { 'm','o','n','d','a','y',0 }, + { 't','u','e','s','d','a','y',0 }, + { 'w','e','d','n','e','s','d','a','y',0 }, + { 't','h','u','r','s','d','a','y',0 }, + { 'f','r','i','d','a','y',0 }, + { 's','a','t','u','r','d','a','y',0 }}; + int i; + for (i = 0; i < sizeof(days)/sizeof(*days); i++) + if (!strcmpiW(day, days[i])) + return i; + + /* Invalid */ + return 7; +} + +static BOOL HTTP_ParseRfc850Date(LPCWSTR value, FILETIME *ft) +{ + static const WCHAR gmt[]= { 'G','M','T',0 }; + WCHAR *nextPtr, day[10], month[4], *monthPtr; + LPCWSTR ptr; + unsigned long num; + SYSTEMTIME st = { 0 }; + + ptr = strchrW(value, ','); + if (!ptr) + return FALSE; + if (ptr - value == 3) + { + memcpy(day, value, (ptr - value) * sizeof(WCHAR)); + day[3] = 0; + st.wDayOfWeek = HTTP_ParseWkday(day); + if (st.wDayOfWeek > 6) + { + ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + return FALSE; + } + } + else if (ptr - value <= sizeof(day) / sizeof(day[0])) + { + memcpy(day, value, (ptr - value) * sizeof(WCHAR)); + day[ptr - value + 1] = 0; + st.wDayOfWeek = HTTP_ParseWeekday(day); + if (st.wDayOfWeek > 6) + { + ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + return FALSE; + } + } + else + { + ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + return FALSE; + } + ptr++; + + while (isspaceW(*ptr)) + ptr++; + + num = strtoulW(ptr, &nextPtr, 10); + if (!nextPtr || nextPtr <= ptr || !num || num > 31) + { + ERR("unexpected day %s\n", debugstr_w(value)); + return FALSE; + } + ptr = nextPtr; + st.wDay = (WORD)num; + + if (*ptr != '-') + { + ERR("unexpected month format %s\n", debugstr_w(ptr)); + return FALSE; + } + ptr++; + + for (monthPtr = month; *ptr != '-' && + monthPtr - month < sizeof(month) / sizeof(month[0]) - 1; + monthPtr++, ptr++) + *monthPtr = *ptr; + *monthPtr = 0; + st.wMonth = HTTP_ParseMonth(month); + if (!st.wMonth || st.wMonth > 12) + { + ERR("unexpected month %s\n", debugstr_w(month)); + return FALSE; + } + + if (*ptr != '-') + { + ERR("unexpected year format %s\n", debugstr_w(ptr)); + return FALSE; + } + ptr++; + + num = strtoulW(ptr, &nextPtr, 10); + if (!nextPtr || nextPtr <= ptr || num < 1601 || num > 30827) + { + ERR("unexpected year %s\n", debugstr_w(value)); + return FALSE; + } + ptr = nextPtr; + st.wYear = (WORD)num; + + if (!HTTP_ParseTime(&st, &ptr)) + return FALSE; + + while (isspaceW(*ptr)) + ptr++; + + if (strcmpW(ptr, gmt)) + { + ERR("unexpected time zone %s\n", debugstr_w(ptr)); + return FALSE; + } + return SystemTimeToFileTime(&st, ft); +} + static BOOL HTTP_ParseDate(LPCWSTR value, FILETIME *ft) { static const WCHAR zero[] = { '0',0 }; @@ -4268,7 +4382,15 @@ static BOOL HTTP_ParseDate(LPCWSTR value, FILETIME *ft) ret = TRUE; } else if (strchrW(value, ',')) + { ret = HTTP_ParseRfc1123Date(value, ft); + if (!ret) + { + ret = HTTP_ParseRfc850Date(value, ft); + if (!ret) + ERR("unexpected date format %s\n", debugstr_w(value)); + } + } else { ret = HTTP_ParseDateAsAsctime(value, ft);

1 0

Aric Stewart : user32: Use Uniscribe in the multiline edit control.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 3b5e14a9b0a925052e2b1b71f76a7f1eff6d84bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5e14a9b0a925052e2b1b71f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 21 11:29:05 2011 -0500 user32: Use Uniscribe in the multiline edit control. --- dlls/user32/edit.c | 252 +++++++++++++++++++++++++++++++++------------------- 1 files changed, 160 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b5e14a9b0a925052e2b1…

1 0

Aric Stewart : msctf: Increase buffer to have room for full key.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: d5090fd9757fbee2190eaa0f54ea39ebcfe657e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5090fd9757fbee2190eaa0f5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 21 20:26:40 2011 -0500 msctf: Increase buffer to have room for full key. --- dlls/msctf/categorymgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/categorymgr.c b/dlls/msctf/categorymgr.c index 7c19c12..a487404 100644 --- a/dlls/msctf/categorymgr.c +++ b/dlls/msctf/categorymgr.c @@ -203,7 +203,7 @@ static HRESULT WINAPI CategoryMgr_FindClosestCategory ( ITfCategoryMgr *iface, { static const WCHAR fmt[] = { '%','s','\\','%','s','\\','C','a','t','e','g','o','r','y','\\','I','t','e','m','\\','%','s',0}; - WCHAR fullkey[110]; + WCHAR fullkey[120]; WCHAR buf[39]; HKEY key; HRESULT hr = S_FALSE;

1 0

Aric Stewart : usp10: Correct itemizing multiple spaces at the beginning of a run.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 729de083f348dead7c2fa50518243288216058d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=729de083f348dead7c2fa5051… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 21 11:28:54 2011 -0500 usp10: Correct itemizing multiple spaces at the beginning of a run. --- dlls/usp10/tests/usp10.c | 8 ++++++++ dlls/usp10/usp10.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1cf1463..6655ba6 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -146,6 +146,10 @@ static void test_ScriptItemize( void ) static const itemTest t1b1[2] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},4,0,0,0,-1}}; static const itemTest t1b2[2] = {{{0,0,0,0,0},0,1,1,1,0},{{0,0,0,0,0},4,0,0,0,-1}}; + static const WCHAR test1c[] = {' ', ' ', ' ', '1', '2', ' ',0}; + static const itemTest t1c1[2] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},6,0,0,0,-1}}; + static const itemTest t1c2[4] = {{{0,0,0,0,0},0,1,1,1,0},{{0,0,1,0,0},3,0,1,2,0},{{0,0,0,0,0},5,1,1,1,0},{{0,0,0,0,0},6,0,0,0,-1}}; + /* Arabic, English*/ static const WCHAR test2[] = {'1','2','3','-','5','2',0x064a,0x064f,0x0633,0x0627,0x0648,0x0650,0x064a,'7','1','.',0}; static const itemTest t21[7] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},3,0,0,0,0},{{0,0,0,0,0},4,0,0,0,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,0,0,0},13,0,0,0,0},{{0,0,0,0,0},15,0,0,0,0},{{0,0,0,0,0},16,0,0,0,-1}}; @@ -291,6 +295,7 @@ static void test_ScriptItemize( void ) test_items_ok(test1,4,NULL,NULL,1,t11,FALSE,0); test_items_ok(test1b,4,NULL,NULL,1,t1b1,FALSE,0); + test_items_ok(test1c,6,NULL,NULL,1,t1c1,FALSE,0); test_items_ok(test2,16,NULL,NULL,6,t21,FALSE,0); test_items_ok(test2b,11,NULL,NULL,4,t2b1,FALSE,0); test_items_ok(test2c,11,NULL,NULL,4,t2c1,FALSE,0); @@ -316,6 +321,7 @@ static void test_ScriptItemize( void ) State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); test_items_ok(test1b,4,&Control,&State,1,t1b1,FALSE,0); + test_items_ok(test1c,6,&Control,&State,1,t1c1,FALSE,0); test_items_ok(test2,16,&Control,&State,4,t22,FALSE,0); test_items_ok(test2b,11,&Control,&State,4,t2b1,FALSE,0); test_items_ok(test2c,11,&Control,&State,5,t2c2,FALSE,0); @@ -341,6 +347,7 @@ static void test_ScriptItemize( void ) State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); test_items_ok(test1b,4,&Control,&State,1,t1b2,FALSE,0); + test_items_ok(test1c,6,&Control,&State,3,t1c2,FALSE,0); test_items_ok(test2,16,&Control,&State,4,t23,FALSE,0); test_items_ok(test2b,11,&Control,&State,4,t2b2,FALSE,0); test_items_ok(test2c,11,&Control,&State,4,t2c3,FALSE,0); @@ -367,6 +374,7 @@ static void test_ScriptItemize( void ) Control.fMergeNeutralItems = TRUE; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); test_items_ok(test1b,4,&Control,&State,1,t1b2,FALSE,0); + test_items_ok(test1c,6,&Control,&State,3,t1c2,FALSE,0); test_items_ok(test2,16,&Control,&State,4,t23,FALSE,0); test_items_ok(test2b,11,&Control,&State,2,t2b3,FALSE,4); test_items_ok(test2c,11,&Control,&State,2,t2c4,FALSE,4); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4b03835..05468eb 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -772,7 +772,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int #define ZWJ 0x200D int cnt = 0, index = 0, str = 0; - int New_Script = SCRIPT_UNDEFINED; + int New_Script = -1; WORD *levels = NULL; WORD *strength = NULL; WORD baselevel = 0; @@ -859,7 +859,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int New_Script = get_char_script(pwcInChars[cnt+j]); } - if ((levels && (levels[cnt] != pItems[index].a.s.uBidiLevel || (strength && (strength[cnt] != str)))) || New_Script != pItems[index].a.eScript || New_Script == Script_Control) + if ((levels && (levels[cnt] != pItems[index].a.s.uBidiLevel || (strength && (strength[cnt] != str)))) || (New_Script != -1 && New_Script != pItems[index].a.eScript) || New_Script == Script_Control) { TRACE("New_Level = %i, New_Strength = %i, New_Script=%d, eScript=%d\n", levels?levels[cnt]:-1, strength?strength[cnt]:str, New_Script, pItems[index].a.eScript);

1 0

Alexandre Julliard : configure: Generate rules to update po files when gettextpo is explicitly requested.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 9159cfe0e62fc2e141bed5eeab8331c1288fa06d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9159cfe0e62fc2e141bed5eea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 22 20:46:36 2011 +0200 configure: Generate rules to update po files when gettextpo is explicitly requested. --- aclocal.m4 | 2 +- configure | 20 ++++++++++++-------- configure.ac | 16 +++++++++++----- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 7a75fa9..887fef9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -204,7 +204,7 @@ wine_fn_pot_rules () ac_dir=$[1] ac_flags=$[2] - test "x$enable_maintainer_mode" = xyes || return + test "x$with_gettextpo" = xyes || return if wine_fn_has_flag mc $ac_flags then diff --git a/configure b/configure index 37d8cba..48978ca 100755 --- a/configure +++ b/configure @@ -1475,7 +1475,7 @@ Optional Packages: --without-fontconfig do not use fontconfig --without-freetype do not use the FreeType library --without-gettext do not use gettext - --without-gettextpo do not use the GetTextPO library + --with-gettextpo use the GetTextPO library to rebuild po files --without-gphoto do not use gphoto (Digital Camera support) --without-glu do not use the GLU library --without-gnutls do not use GnuTLS (schannel support) @@ -10549,11 +10549,11 @@ $as_echo "#define HAVE_LIBGETTEXTPO 1" >>confdefs.h fi fi - if test "x$LIBGETTEXTPO" = "x"; then : + test "x$with_gettextpo" != xyes || if test "x$LIBGETTEXTPO" = "x"; then : case "x$with_gettextpo" in - x) as_fn_append wine_warnings "|GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported." ;; + x) as_fn_append wine_notices "|GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt." ;; xno) ;; - *) as_fn_error $? "GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported. + *) as_fn_error $? "GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt. This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; esac fi @@ -14294,7 +14294,7 @@ wine_fn_pot_rules () ac_dir=$1 ac_flags=$2 - test "x$enable_maintainer_mode" = xyes || return + test "x$with_gettextpo" = xyes || return if wine_fn_has_flag mc $ac_flags then @@ -15430,10 +15430,14 @@ then \$(srcdir)/include/config.h.in: include/stamp-h.in \$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 cd \$(srcdir) && autoheader --warnings=all - @echo timestamp > \$@ + @echo timestamp > \$@" +fi -ALL_POT_FILES =$ALL_POT_FILES -\$(LINGUAS:%=$srcdir/po/%.po): \$(srcdir)/po/wine.pot +if test "x$with_gettextpo" = xyes +then + test "$srcdir" = . || as_fn_error $? "Rebuilding po files is not supported for out of tree builds." "$LINENO" 5 + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "ALL_POT_FILES =$ALL_POT_FILES +\$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot msgmerge -q \$@ \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@ \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES) msgcat -o \$@ \$(ALL_POT_FILES)" diff --git a/configure.ac b/configure.ac index 4b1f718..ad4f36f 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontcon [if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi]) AC_ARG_WITH(freetype, AS_HELP_STRING([--without-freetype],[do not use the FreeType library])) AC_ARG_WITH(gettext, AS_HELP_STRING([--without-gettext],[do not use gettext])) -AC_ARG_WITH(gettextpo, AS_HELP_STRING([--without-gettextpo],[do not use the GetTextPO library]), +AC_ARG_WITH(gettextpo, AS_HELP_STRING([--with-gettextpo],[use the GetTextPO library to rebuild po files]), [if test "x$withval" = "xno"; then ac_cv_header_gettext_po_h=no; fi]) AC_ARG_WITH(gphoto, AS_HELP_STRING([--without-gphoto],[do not use gphoto (Digital Camera support)])) AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU library]), @@ -1440,7 +1440,8 @@ then [AC_DEFINE(HAVE_LIBGETTEXTPO,1,[Define to 1 if you have the `gettextpo' library (-lgettextpo).]) AC_SUBST(LIBGETTEXTPO,"-lgettextpo")]) fi - WINE_WARNING_WITH(gettextpo,[test "x$LIBGETTEXTPO" = "x"],[GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported.]) + test "x$with_gettextpo" != xyes || WINE_NOTICE_WITH(gettextpo,[test "x$LIBGETTEXTPO" = "x"], + [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.]) fi dnl **** Check for gstreamer **** @@ -3063,10 +3064,15 @@ then \$(srcdir)/include/config.h.in: include/stamp-h.in \$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 cd \$(srcdir) && autoheader --warnings=all - @echo timestamp > \$[@] + @echo timestamp > \$[@]]) +fi -ALL_POT_FILES =$ALL_POT_FILES -\$(LINGUAS:%=$srcdir/po/%.po): \$(srcdir)/po/wine.pot +if test "x$with_gettextpo" = xyes +then + test "$srcdir" = . || AC_MSG_ERROR([Rebuilding po files is not supported for out of tree builds.]) + WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], +[ALL_POT_FILES =$ALL_POT_FILES +\$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot msgmerge -q \$[@] \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$[(a)].new && mv \$[(a)].new \$[@] \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES) msgcat -o \$[@] \$(ALL_POT_FILES)])

1 0

Alexandre Julliard : wrc: Load translations from mo files instead of po.
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: f4ec097c9b1f20e7ffd6aca6225c6a8a5fb1552a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ec097c9b1f20e7ffd6aca62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 22 18:21:04 2011 +0200 wrc: Load translations from mo files instead of po. --- Make.rules.in | 6 +- Make.vars.in | 2 +- configure | 7 ++- configure.ac | 5 +- tools/wrc/po.c | 171 ++++++++++++++++++++++++++++++++++++-------------- tools/wrc/wrc.c | 2 +- tools/wrc/wrc.man.in | 4 +- 7 files changed, 140 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4ec097c9b1f20e7ffd6a…

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
79
Older →

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 2011