November 2008 - Wine-commits

Francois Gouget : atl: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 0a9c529072bfcdc2c6bac829ce3f76f4c79269ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9c529072bfcdc2c6bac829c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 24 00:15:36 2008 +0100 atl: Remove WINAPI on static functions where not needed. --- dlls/atl/atl_ax.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index e20c342..a5ae342 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -117,7 +117,7 @@ BOOL WINAPI AtlAxWinInit(void) */ -static ULONG WINAPI IOCS_AddRef(IOCS *This) +static ULONG IOCS_AddRef(IOCS *This) { ULONG ref = InterlockedIncrement(&This->ref); @@ -132,7 +132,7 @@ static ULONG WINAPI IOCS_AddRef(IOCS *This) #define THIS2IOLEINPLACEFRAME(This) ((IOleInPlaceFrame*)&This->lpOleInPlaceFrameVtbl) #define THIS2IOLECONTROLSITE(This) ((IOleControlSite*)&This->lpOleControlSiteVtbl) -static HRESULT WINAPI IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv) +static HRESULT IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -166,7 +166,7 @@ static HRESULT WINAPI IOCS_QueryInterface(IOCS *This, REFIID riid, void **ppv) } static HRESULT IOCS_Detach( IOCS *This ); -static ULONG WINAPI IOCS_Release(IOCS *This) +static ULONG IOCS_Release(IOCS *This) { ULONG ref = InterlockedDecrement(&This->ref);

1 0

Andrew Nguyen : jscript: Implement the String.toUpperCase() method.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 3909672f59f25d288dc286e5d12d5f04d4ae4393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3909672f59f25d288dc286e5d… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Nov 23 16:36:50 2008 -0600 jscript: Implement the String.toUpperCase() method. --- dlls/jscript/string.c | 30 ++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 11 +++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 391f370..5c074e8 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1102,8 +1102,34 @@ static HRESULT String_toLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DIS static HRESULT String_toUpperCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + StringInstance *string; + const WCHAR* str; + DWORD length; + BSTR bstr; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_STRING)) { + string = (StringInstance*)dispex; + + length = string->length; + str = string->str; + }else { + FIXME("not string this not supported\n"); + return E_NOTIMPL; + } + + if(retv) { + bstr = SysAllocStringLen(str, length); + if (!bstr) + return E_OUTOFMEMORY; + + struprW(bstr); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = bstr; + } + return S_OK; } static HRESULT String_toLocaleLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index fc913eb..4f843ec 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -258,6 +258,17 @@ ok(tmp === "test", "''.toLowerCase() = " + tmp); tmp = "tEsT".toLowerCase(3); ok(tmp === "test", "''.toLowerCase(3) = " + tmp); +tmp = "".toUpperCase(); +ok(tmp === "", "''.toUpperCase() = " + tmp); +tmp = "TEST".toUpperCase(); +ok(tmp === "TEST", "''.toUpperCase() = " + tmp); +tmp = "TEST".toUpperCase(3); +ok(tmp === "TEST", "''.toUpperCase(3) = " + tmp); +tmp = "tEsT".toUpperCase(); +ok(tmp === "TEST", "''.toUpperCase() = " + tmp); +tmp = "tEsT".toUpperCase(3); +ok(tmp === "TEST", "''.toUpperCase(3) = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Andrew Nguyen : jscript: Implement the String.toLowerCase() method.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: c4148203c60e19ce01ebccc51eff7993534eb4f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4148203c60e19ce01ebccc51… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Nov 23 16:35:40 2008 -0600 jscript: Implement the String.toLowerCase() method. --- dlls/jscript/string.c | 30 ++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 11 +++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index c6d789e..391f370 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1069,8 +1069,34 @@ static HRESULT String_sup(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT String_toLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + StringInstance *string; + const WCHAR* str; + DWORD length; + BSTR bstr; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_STRING)) { + string = (StringInstance*)dispex; + + length = string->length; + str = string->str; + }else { + FIXME("not string this not supported\n"); + return E_NOTIMPL; + } + + if(retv) { + bstr = SysAllocStringLen(str, length); + if (!bstr) + return E_OUTOFMEMORY; + + strlwrW(bstr); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = bstr; + } + return S_OK; } static HRESULT String_toUpperCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 6378bdd..fc913eb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -247,6 +247,17 @@ ok(tmp === 1, "indexOf = " + tmp); tmp = "abcd".indexOf(); ok(tmp == -1, "indexOf = " + tmp); +tmp = "".toLowerCase(); +ok(tmp === "", "''.toLowerCase() = " + tmp); +tmp = "test".toLowerCase(); +ok(tmp === "test", "''.toLowerCase() = " + tmp); +tmp = "test".toLowerCase(3); +ok(tmp === "test", "''.toLowerCase(3) = " + tmp); +tmp = "tEsT".toLowerCase(); +ok(tmp === "test", "''.toLowerCase() = " + tmp); +tmp = "tEsT".toLowerCase(3); +ok(tmp === "test", "''.toLowerCase(3) = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Peter Dons Tychsen : winedos: Fixed memory resize function which returned paragraphs in some cases instead of bytes .
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: e83b62f3d0b2fdd779e2065920ada180f5e58d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e83b62f3d0b2fdd779e206592… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Mon Nov 24 00:22:35 2008 +0100 winedos: Fixed memory resize function which returned paragraphs in some cases instead of bytes. --- dlls/winedos/dosmem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/dosmem.c b/dlls/winedos/dosmem.c index 76bf10c..d453da3 100644 --- a/dlls/winedos/dosmem.c +++ b/dlls/winedos/dosmem.c @@ -368,7 +368,7 @@ UINT DOSMEM_ResizeBlock(void *ptr, UINT size, BOOL exact) /* resize needed? */ if (mcb->size == size) - return size; + return size << 4; /* collapse free blocks */ DOSMEM_Collapse( mcb );

1 0

Alexandre Julliard : kernel32: Fix the base DOS memory address when the low 64K are not accessible.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: a488ee8e7adcf58d003710f6a21bfbf6551a4de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a488ee8e7adcf58d003710f6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 24 13:45:42 2008 +0100 kernel32: Fix the base DOS memory address when the low 64K are not accessible. --- dlls/kernel32/dosmem.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/dosmem.c b/dlls/kernel32/dosmem.c index a1bff4d..8b0653b 100644 --- a/dlls/kernel32/dosmem.c +++ b/dlls/kernel32/dosmem.c @@ -170,15 +170,16 @@ BOOL DOSMEM_Init(void) ExitProcess(1); } - DOSMEM_dosmem = addr; - if (!addr) + if (addr <= (void *)DOSMEM_64KB) { + DOSMEM_dosmem = 0; DOSMEM_protect = DOSMEM_64KB; sysmem = (char *)0xf0000; /* store sysmem in high addresses for now */ } else { WARN( "First megabyte not available for DOS address space.\n" ); + DOSMEM_dosmem = addr; DOSMEM_protect = 0; sysmem = DOSMEM_dosmem; }

1 0

Christian Costa : wined3d: Implement CONVERT_CK_RGB24 in d3dfmt_convert_surface.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 632d34651f4a27e9caeafe102d49011874d7e78e URL: http://source.winehq.org/git/wine.git/?a=commit;h=632d34651f4a27e9caeafe102… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 23 21:31:51 2008 +0100 wined3d: Implement CONVERT_CK_RGB24 in d3dfmt_convert_surface. --- dlls/wined3d/surface.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1849b83..77f32ef 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1845,6 +1845,29 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN } break; + case CONVERT_CK_RGB24: + { + /* Converting R8G8B8 format to R8G8B8A8 with color-keying. */ + unsigned int x, y; + for (y = 0; y < height; y++) + { + source = src + pitch * y; + dest = dst + outpitch * y; + for (x = 0; x < width; x++) { + DWORD color = ((DWORD)source[0] << 16) + ((DWORD)source[1] << 8) + (DWORD)source[2] ; + DWORD dstcolor = color << 8; + if ((color < This->SrcBltCKey.dwColorSpaceLowValue) || + (color > This->SrcBltCKey.dwColorSpaceHighValue)) { + dstcolor |= 0xff; + } + *(DWORD*)dest = dstcolor; + source += 3; + dest += 4; + } + } + } + break; + case CONVERT_RGB32_888: { /* Converting X8R8G8B8 format to R8G8B8A8 with color-keying. */

1 0

Kai Blin : dbghelp: Upgrade FIXME to ERR.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 4dedbd404c982069199c003cf620843c0c5d558c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dedbd404c982069199c003cf… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Nov 23 22:07:36 2008 +0100 dbghelp: Upgrade FIXME to ERR. --- dlls/dbghelp/storage.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 88c9b1d..04ea378 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -96,7 +96,7 @@ void* pool_alloc(struct pool* pool, unsigned len) } arena = HeapAlloc(GetProcessHeap(), 0, pool->arena_size); - if (!arena) {FIXME("OOM\n");return NULL;} + if (!arena) {ERR("OOM\n");return NULL;} ret = (char*)arena + sizeof(*arena); arena->next = pool->first;

1 0

Alexandre Julliard : configure: Print a few more hints about requiring 32-bit libraries.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: d2c8bfbf8abde89dee4a48ddcfef752839a78c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c8bfbf8abde89dee4a48ddc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 24 13:45:25 2008 +0100 configure: Print a few more hints about requiring 32-bit libraries. --- configure | 14 ++++++-------- configure.ac | 7 +++---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/configure b/configure index b2e0470..5b4c30c 100755 --- a/configure +++ b/configure @@ -12159,13 +12159,13 @@ fi if test "x$XLIB" = "x"; then case "x$with_x" in xno) ;; - *) { { $as_echo "$as_me:$LINENO: error: X development files not found. Wine will be built + *) { { $as_echo "$as_me:$LINENO: error: X ${notice_platform}development files not found. Wine will be built without X support, which probably isn't what you want. You will need to install -development packages of Xlib/Xfree86 at the very least. +${notice_platform}development packages of Xlib/Xfree86 at the very least. Use the --without-x option if you really want this." >&5 -$as_echo "$as_me: error: X development files not found. Wine will be built +$as_echo "$as_me: error: X ${notice_platform}development files not found. Wine will be built without X support, which probably isn't what you want. You will need to install -development packages of Xlib/Xfree86 at the very least. +${notice_platform}development packages of Xlib/Xfree86 at the very least. Use the --without-x option if you really want this." >&2;} { (exit 1); exit 1; }; } ;; esac @@ -14905,11 +14905,9 @@ fi if test "x$FREETYPELIBS" = "x"; then case "x$with_freetype" in xno) ;; - *) { { $as_echo "$as_me:$LINENO: error: FreeType development files not found. -Fonts will not be built. Dialog text may be invisible or unaligned. + *) { { $as_echo "$as_me:$LINENO: error: FreeType ${notice_platform}development files not found. Fonts will not be built. Use the --without-freetype option if you really want this." >&5 -$as_echo "$as_me: error: FreeType development files not found. -Fonts will not be built. Dialog text may be invisible or unaligned. +$as_echo "$as_me: error: FreeType ${notice_platform}development files not found. Fonts will not be built. Use the --without-freetype option if you really want this." >&2;} { (exit 1); exit 1; }; } ;; esac diff --git a/configure.ac b/configure.ac index d2446f3..f79b062 100644 --- a/configure.ac +++ b/configure.ac @@ -826,9 +826,9 @@ else enable_opengl32=${enable_opengl32:-no} enable_glu32=${enable_glu32:-no} fi -WINE_ERROR_WITH(x,[test "x$XLIB" = "x"],[X development files not found. Wine will be built +WINE_ERROR_WITH(x,[test "x$XLIB" = "x"],[X ${notice_platform}development files not found. Wine will be built without X support, which probably isn't what you want. You will need to install -development packages of Xlib/Xfree86 at the very least.]) +${notice_platform}development packages of Xlib/Xfree86 at the very least.]) dnl **** Check for libxml2 **** @@ -1048,8 +1048,7 @@ then fi fi fi -WINE_ERROR_WITH(freetype,[test "x$FREETYPELIBS" = "x"],[FreeType development files not found. -Fonts will not be built. Dialog text may be invisible or unaligned.]) +WINE_ERROR_WITH(freetype,[test "x$FREETYPELIBS" = "x"],[FreeType ${notice_platform}development files not found. Fonts will not be built.]) test "x$FREETYPELIBS" = "x" && enable_fonts=${enable_fonts:-no} dnl **** Check for parport (currently Linux only) ****

1 0

Christian Costa : d3dxof: Small clean-up.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: eaaced6cc586116081285e30cabe54d6a6e97ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaaced6cc586116081285e30c… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 23 21:30:37 2008 +0100 d3dxof: Small clean-up. --- dlls/d3dxof/d3dxof.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 79dc59b..3093fb3 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -804,7 +804,7 @@ static WORD parse_TOKEN(parse_buffer * buf) if (!read_bytes(buf, &token, 2)) return 0; - /* Convert integer and float list into sereparate elements */ + /* Convert integer and float list into separate elements */ if (token == TOKEN_INTEGER_LIST) { if (!read_bytes(buf, &nb_elem, 4)) @@ -1859,8 +1859,6 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; } nb_elems = last_dword; - /*FIXME("Arrays with variable size not yet supported\n"); - return FALSE;*/ } else nb_elems = pt->members[i].dim_value[0]; @@ -1889,7 +1887,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) { int j; - TRACE("Found suboject %s\n", buf->pdxf->xtemplates[pt->members[i].idx_template].name); + TRACE("Found sub-object %s\n", buf->pdxf->xtemplates[pt->members[i].idx_template].name); buf->level++; /* To do template lookup */ for (j = 0; j < buf->pdxf->nb_xtemplates; j++) @@ -1913,8 +1911,6 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; } buf->level--; - /*if (get_TOKEN(buf) != TOKEN_SEMICOLON) - return FALSE;*/ } else {

1 0

Christian Costa : d3dxof: Finish support for multi-dimensional array.
by Alexandre Julliard 24 Nov '08

24 Nov '08

Module: wine Branch: master Commit: 40fff317ea1fbb4a012bf6d96a07ed37b5366990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40fff317ea1fbb4a012bf6d96… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 23 21:31:13 2008 +0100 d3dxof: Finish support for multi-dimensional array. --- dlls/d3dxof/d3dxof.c | 34 +++++++++++++++------------------- dlls/d3dxof/d3dxof_private.h | 2 +- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 3093fb3..5f471b1 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1100,6 +1100,11 @@ static BOOL parse_template_members_list(parse_buffer * buf) { while (check_TOKEN(buf) == TOKEN_OBRACKET) { + if (nb_dims >= MAX_ARRAY_DIM) + { + FIXME("Too many dimensions (%d) for multi-dimensional array\n", nb_dims + 1); + return FALSE; + } get_TOKEN(buf); if (check_TOKEN(buf) == TOKEN_INTEGER) { @@ -1842,29 +1847,20 @@ static BOOL parse_object_members_list(parse_buffer * buf) for (i = 0; i < pt->nb_members; i++) { - int nb_elems, k; + int k; + int nb_elems = 1; - if (pt->members[i].nb_dims > 1) - { - FIXME("Arrays with dimension > 1 not yet supported\n"); - return FALSE; - } - else if (pt->members[i].nb_dims) + buf->pxo->members[i].start = buf->cur_pdata; + + for (k = 0; k < pt->members[i].nb_dims; k++) { - if (!pt->members[i].dim_fixed[0]) - { - if (!i) - { - FIXME("Array with variable must be preceded by the size\n"); - return FALSE; - } - nb_elems = last_dword; - } + if (pt->members[i].dim_fixed[k]) + nb_elems *= pt->members[i].dim_value[k]; else - nb_elems = pt->members[i].dim_value[0]; + nb_elems *= *(DWORD*)buf->pxo->members[pt->members[i].dim_value[k]].start; } - else - nb_elems = 1; + + TRACE("Elements to consider: %d\n", nb_elems); for (k = 0; k < nb_elems; k++) { diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 1789dc7..b2f5b41 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -34,7 +34,7 @@ #include "dxfile.h" #define MAX_NAME_LEN 32 -#define MAX_ARRAY_DIM 1 +#define MAX_ARRAY_DIM 4 #define MAX_MEMBERS 50 #define MAX_CHILDS 20 #define MAX_TEMPLATES 200

1 0