wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Piotr Caban : msvcrt: Added support for unicode text mode in open functions family.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 424ce2d2f5a7474c847473fbc3103a1ade2c55e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424ce2d2f5a7474c847473fbc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:42:29 2013 +0100 msvcrt: Added support for unicode text mode in open functions family. --- dlls/msvcrt/file.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 101 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index a9f0d87..8ee6bed 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -66,6 +66,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define WX_APPEND 0x20 #define WX_TEXT 0x80 +/* values for exflag - it's used differently in msvcr90.dll*/ +#define EF_UTF8 0x01 +#define EF_UTF16 0x02 +#define EF_CRIT_INIT 0x04 +#define EF_UNK_UNICODE 0x08 + +static char utf8_bom[3] = { 0xef, 0xbb, 0xbf }; +static char utf16_bom[2] = { 0xff, 0xfe }; + /* FIXME: this should be allocated dynamically */ #define MSVCRT_MAX_FILES 2048 #define MSVCRT_FD_BLOCK_SIZE 32 @@ -75,7 +84,7 @@ typedef struct { HANDLE handle; unsigned char wxflag; char unk1; - BOOL crit_init; + int exflag; CRITICAL_SECTION crit; } ioinfo; @@ -311,6 +320,7 @@ static int msvcrt_alloc_fd_from(HANDLE hand, int flag, int fd) fdinfo->handle = hand; fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT)); + fdinfo->exflag = 0; /* locate next free slot */ if (fd == MSVCRT_fdstart && fd == MSVCRT_fdend) @@ -484,6 +494,7 @@ void msvcrt_init_io(void) GetCurrentProcess(), &fdinfo->handle, 0, TRUE, DUPLICATE_SAME_ACCESS)) fdinfo->wxflag = WX_OPEN | WX_TEXT; + fdinfo->exflag = 0; } fdinfo = msvcrt_get_ioinfo(1); @@ -494,6 +505,7 @@ void msvcrt_init_io(void) GetCurrentProcess(), &fdinfo->handle, 0, TRUE, DUPLICATE_SAME_ACCESS)) fdinfo->wxflag = WX_OPEN | WX_TEXT; + fdinfo->exflag = 0; } fdinfo = msvcrt_get_ioinfo(2); @@ -504,6 +516,7 @@ void msvcrt_init_io(void) GetCurrentProcess(), &fdinfo->handle, 0, TRUE, DUPLICATE_SAME_ACCESS)) fdinfo->wxflag = WX_OPEN | WX_TEXT; + fdinfo->exflag = 0; } TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(0)->handle, @@ -1859,6 +1872,29 @@ int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) return fd; } +static int check_bom(HANDLE h, int oflags, BOOL seek) +{ + char bom[sizeof(utf8_bom)]; + DWORD r; + + oflags &= ~(MSVCRT__O_WTEXT|MSVCRT__O_U16TEXT|MSVCRT__O_U8TEXT); + + if (!ReadFile(h, bom, sizeof(utf8_bom), &r, NULL)) + return oflags; + + if (r==sizeof(utf8_bom) && !memcmp(bom, utf8_bom, sizeof(utf8_bom))) { + oflags |= MSVCRT__O_U8TEXT; + }else if (r>=sizeof(utf16_bom) && !memcmp(bom, utf16_bom, sizeof(utf16_bom))) { + if (seek && r>2) + SetFilePointer(h, 2, NULL, FILE_BEGIN); + oflags |= MSVCRT__O_U16TEXT; + }else if (seek) { + SetFilePointer(h, 0, NULL, FILE_BEGIN); + } + + return oflags; +} + /********************************************************************* * _wsopen_s (MSVCRT.@) */ @@ -1937,16 +1973,78 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = !(oflags & MSVCRT__O_NOINHERIT); - hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); + if ((oflags&(MSVCRT__O_WTEXT|MSVCRT__O_U16TEXT|MSVCRT__O_U8TEXT)) + && (creation==OPEN_ALWAYS || creation==OPEN_EXISTING) + && !(access&GENERIC_READ)) + { + hand = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, + &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); + if (hand != INVALID_HANDLE_VALUE) + { + oflags = check_bom(hand, oflags, FALSE); + CloseHandle(hand); + } + else + oflags &= ~(MSVCRT__O_WTEXT|MSVCRT__O_U16TEXT|MSVCRT__O_U8TEXT); + } + hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); if (hand == INVALID_HANDLE_VALUE) { WARN(":failed-last error (%d)\n",GetLastError()); msvcrt_set_errno(GetLastError()); - msvcrt_set_errno(GetLastError()); return *MSVCRT__errno(); } + if (oflags & (MSVCRT__O_WTEXT|MSVCRT__O_U16TEXT|MSVCRT__O_U8TEXT)) + { + if ((access & GENERIC_WRITE) && (creation==CREATE_NEW + || creation==CREATE_ALWAYS || creation==TRUNCATE_EXISTING + || (creation==OPEN_ALWAYS && GetLastError()==ERROR_ALREADY_EXISTS))) + { + if (oflags & MSVCRT__O_U8TEXT) + { + DWORD written = 0, tmp; + + while(written!=sizeof(utf8_bom) && WriteFile(hand, (char*)utf8_bom+written, + sizeof(utf8_bom)-written, &tmp, NULL)) + written += tmp; + if (written != sizeof(utf8_bom)) { + WARN("error writting BOM\n"); + CloseHandle(hand); + msvcrt_set_errno(GetLastError()); + return *MSVCRT__errno(); + } + } + else + { + DWORD written = 0, tmp; + + while(written!=sizeof(utf16_bom) && WriteFile(hand, (char*)utf16_bom+written, + sizeof(utf16_bom)-written, &tmp, NULL)) + written += tmp; + if (written != sizeof(utf16_bom)) + { + WARN("error writting BOM\n"); + CloseHandle(hand); + msvcrt_set_errno(GetLastError()); + return *MSVCRT__errno(); + } + } + } + else if (access & GENERIC_READ) + oflags = check_bom(hand, oflags, TRUE); + } + *fd = msvcrt_alloc_fd(hand, wxflag); + if (*fd == -1) + return *MSVCRT__errno(); + + if (oflags & MSVCRT__O_WTEXT) + msvcrt_get_ioinfo(*fd)->exflag |= EF_UTF16|EF_UNK_UNICODE; + else if (oflags & MSVCRT__O_U16TEXT) + msvcrt_get_ioinfo(*fd)->exflag |= EF_UTF16; + else if (oflags & MSVCRT__O_U8TEXT) + msvcrt_get_ioinfo(*fd)->exflag |= EF_UTF8; TRACE(":fd (%d) handle (%p)\n", *fd, hand); return 0;

1 0

Piotr Caban : msvcrt: Added support for unicode open mode in msvcrt_get_flags function.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 96be6eb570cdf0da9e085e70d1bbb2e59b5b920f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96be6eb570cdf0da9e085e70d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:42:15 2013 +0100 msvcrt: Added support for unicode open mode in msvcrt_get_flags function. --- dlls/msvcrt/file.c | 61 +++++++++++++++++++++++++++++++++++++++++++++---- dlls/msvcrt/msvcrt.h | 3 ++ 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e59a10c..a9f0d87 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1245,6 +1245,8 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st { int plus = strchrW(mode, '+') != NULL; + TRACE("%s\n", debugstr_w(mode)); + switch(*mode++) { case 'R': case 'r': @@ -1260,12 +1262,11 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st *stream_flags = plus ? MSVCRT__IORW : MSVCRT__IOWRT; break; default: - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - *MSVCRT__errno() = MSVCRT_EINVAL; + MSVCRT_INVALID_PMT(0, MSVCRT_EINVAL); return -1; } - while (*mode) + while (*mode && *mode!=',') switch (*mode++) { case 'B': case 'b': @@ -1286,8 +1287,54 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st case ' ': break; default: - FIXME(":unknown flag %c not supported\n",mode[-1]); + MSVCRT_INVALID_PMT(0, MSVCRT_EINVAL); + return -1; + } + + if(*mode == ',') + { + static const WCHAR ccs[] = {'c','c','s'}; + static const WCHAR utf8[] = {'u','t','f','-','8'}; + static const WCHAR utf16le[] = {'u','t','f','-','1','6','l','e'}; + static const WCHAR unicode[] = {'u','n','i','c','o','d','e'}; + + mode++; + while(*mode == ' ') mode++; + if(!MSVCRT_CHECK_PMT(!strncmpW(ccs, mode, sizeof(ccs)/sizeof(ccs[0])))) + return -1; + mode += sizeof(ccs)/sizeof(ccs[0]); + while(*mode == ' ') mode++; + if(!MSVCRT_CHECK_PMT(*mode == '=')) + return -1; + mode++; + while(*mode == ' ') mode++; + + if(!strncmpiW(utf8, mode, sizeof(utf8)/sizeof(utf8[0]))) + { + *open_flags |= MSVCRT__O_U8TEXT; + mode += sizeof(utf8)/sizeof(utf8[0]); + } + else if(!strncmpiW(utf16le, mode, sizeof(utf16le)/sizeof(utf16le[0]))) + { + *open_flags |= MSVCRT__O_U16TEXT; + mode += sizeof(utf16le)/sizeof(utf16le[0]); + } + else if(!strncmpiW(unicode, mode, sizeof(unicode)/sizeof(unicode[0]))) + { + *open_flags |= MSVCRT__O_WTEXT; + mode += sizeof(unicode)/sizeof(unicode[0]); } + else + { + MSVCRT_INVALID_PMT(0, MSVCRT_EINVAL); + return -1; + } + + while(*mode == ' ') mode++; + } + + if(!MSVCRT_CHECK_PMT(*mode == 0)) + return -1; return 0; } @@ -1623,6 +1670,9 @@ static unsigned split_oflags(unsigned oflags) if (oflags & MSVCRT__O_APPEND) wxflags |= WX_APPEND; if (oflags & MSVCRT__O_BINARY) {/* Nothing to do */} else if (oflags & MSVCRT__O_TEXT) wxflags |= WX_TEXT; + else if (oflags & MSVCRT__O_WTEXT) wxflags |= WX_TEXT; + else if (oflags & MSVCRT__O_U16TEXT) wxflags |= WX_TEXT; + else if (oflags & MSVCRT__O_U8TEXT) wxflags |= WX_TEXT; else if (*__p__fmode() & MSVCRT__O_BINARY) {/* Nothing to do */} else wxflags |= WX_TEXT; /* default to TEXT*/ if (oflags & MSVCRT__O_NOINHERIT) wxflags |= WX_DONTINHERIT; @@ -1632,7 +1682,8 @@ static unsigned split_oflags(unsigned oflags) MSVCRT__O_TRUNC|MSVCRT__O_EXCL|MSVCRT__O_CREAT| MSVCRT__O_RDWR|MSVCRT__O_WRONLY|MSVCRT__O_TEMPORARY| MSVCRT__O_NOINHERIT| - MSVCRT__O_SEQUENTIAL|MSVCRT__O_RANDOM|MSVCRT__O_SHORT_LIVED + MSVCRT__O_SEQUENTIAL|MSVCRT__O_RANDOM|MSVCRT__O_SHORT_LIVED| + MSVCRT__O_WTEXT|MSVCRT__O_U16TEXT|MSVCRT__O_U8TEXT ))) ERR(":unsupported oflags 0x%04x\n",unsupp); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 096f77a..30779bc 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -750,6 +750,9 @@ struct MSVCRT__stat64 { #define MSVCRT__O_TEXT 0x4000 #define MSVCRT__O_BINARY 0x8000 #define MSVCRT__O_RAW MSVCRT__O_BINARY +#define MSVCRT__O_WTEXT 0x10000 +#define MSVCRT__O_U16TEXT 0x20000 +#define MSVCRT__O_U8TEXT 0x40000 /* _statusfp bit flags */ #define MSVCRT__SW_INEXACT 0x00000001 /* inexact (precision) */

1 0

Piotr Caban : msvcrt: Don't duplicate wfsopen functionality in wfrepopen.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: a6daa3519d3e4e753e33fa5591447499622451ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6daa3519d3e4e753e33fa559… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:41:55 2013 +0100 msvcrt: Don't duplicate wfsopen functionality in wfrepopen. --- dlls/msvcrt/file.c | 19 ++----------------- 1 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2db13f8..e59a10c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3245,7 +3245,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm */ MSVCRT_FILE* CDECL MSVCRT__wfreopen(const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode, MSVCRT_FILE* file) { - int open_flags, stream_flags, fd; + int fd; TRACE(":path (%s) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file->_file); @@ -3255,22 +3255,7 @@ MSVCRT_FILE* CDECL MSVCRT__wfreopen(const MSVCRT_wchar_t *path, const MSVCRT_wch else { MSVCRT_fclose(file); - /* map mode string to open() flags. "man fopen" for possibilities. */ - if (msvcrt_get_flags(mode, &open_flags, &stream_flags) == -1) - file = NULL; - else - { - fd = MSVCRT__wopen(path, open_flags, MSVCRT__S_IREAD | MSVCRT__S_IWRITE); - if (fd < 0) - file = NULL; - else if (msvcrt_init_fp(file, fd, stream_flags) == -1) - { - file->_flag = 0; - WARN(":failed-last error (%d)\n",GetLastError()); - msvcrt_set_errno(GetLastError()); - file = NULL; - } - } + file = MSVCRT__wfsopen(path, mode, MSVCRT__SH_DENYNO); } UNLOCK_FILES(); return file;

1 0

Christian Costa : d3dx9_36: Implement ID3DXFileDataImpl_GetType.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 8113346d3a930b08ed44786fcda5d5bdd6bf1790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8113346d3a930b08ed44786fc… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jan 10 09:37:01 2013 +0100 d3dx9_36: Implement ID3DXFileDataImpl_GetType. --- dlls/d3dx9_36/xfile.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index d4f08e3..8fa20ff 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -169,9 +169,19 @@ static HRESULT WINAPI ID3DXFileDataImpl_Unlock(ID3DXFileData *iface) static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID *guid) { - FIXME("(%p)->(%p): stub\n", iface, guid); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + const GUID *dxfile_guid; + HRESULT ret; - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, guid); + + ret = IDirectXFileData_GetType(This->dxfile_data, &dxfile_guid); + if (ret != DXFILE_OK) + return error_dxfile_to_d3dxfile(ret); + + *guid = *dxfile_guid; + + return S_OK; }

1 0

Christian Costa : d3dx9_36: Implement ID3DXFileEnumObjectImpl_GetChildren and ID3DXFileEnumObjectImpl_GetChild .
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: c5d96f40d2e953916322d933627611d2be273dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d96f40d2e953916322d9336… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jan 10 09:36:53 2013 +0100 d3dx9_36: Implement ID3DXFileEnumObjectImpl_GetChildren and ID3DXFileEnumObjectImpl_GetChild. --- dlls/d3dx9_36/xfile.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 5db7800..d4f08e3 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -300,17 +300,32 @@ static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetFile(ID3DXFileEnumObject *iface static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetChildren(ID3DXFileEnumObject *iface, SIZE_T *children) { - FIXME("(%p)->(%p): stub\n", iface, children); + ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, children); + + if (!children) + return E_POINTER; + + *children = This->nb_children; + + return S_OK; } static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetChild(ID3DXFileEnumObject *iface, SIZE_T id, ID3DXFileData **object) { - FIXME("(%p)->(%lu, %p): stub\n", iface, id, object); + ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); - return E_NOTIMPL; + TRACE("(%p)->(%lu, %p)\n", iface, id, object); + + if (!object) + return E_POINTER; + + *object = This->children[id]; + (*object)->lpVtbl->AddRef(*object); + + return S_OK; }

1 0

Andrew Talbot : ddraw: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 1e31182c0b528f389b4e9dd5ce5802d9f04bbbb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e31182c0b528f389b4e9dd5c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 9 21:36:17 2013 +0000 ddraw: Avoid signed-unsigned integer comparisons. --- dlls/ddraw/executebuffer.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index f09460f..1b412f7 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -92,7 +92,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; case D3DOP_TRIANGLE: { - int i; + DWORD i; D3DTLVERTEX *tl_vx = buffer->vertex_data; TRACE("TRIANGLE (%d)\n", count); @@ -143,7 +143,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, break; case D3DOP_MATRIXMULTIPLY: { - int i; + DWORD i; TRACE("MATRIXMULTIPLY (%d)\n", count); for (i = 0; i < count; ++i) @@ -171,7 +171,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; case D3DOP_STATETRANSFORM: { - int i; + DWORD i; TRACE("STATETRANSFORM (%d)\n", count); for (i = 0; i < count; ++i) @@ -201,7 +201,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; case D3DOP_STATELIGHT: { - int i; + DWORD i; TRACE("STATELIGHT (%d)\n", count); for (i = 0; i < count; i++) { @@ -267,7 +267,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; case D3DOP_STATERENDER: { - int i; + DWORD i; IDirect3DDevice2 *d3d_device2 = &device->IDirect3DDevice2_iface; TRACE("STATERENDER (%d)\n", count); @@ -285,7 +285,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, /* TODO: Share code with IDirect3DVertexBuffer::ProcessVertices and / or * IWineD3DDevice::ProcessVertices */ - int i; + DWORD i; D3DMATRIX view_mat, world_mat, proj_mat; TRACE("PROCESSVERTICES (%d)\n", count); @@ -466,7 +466,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; case D3DOP_BRANCHFORWARD: { - int i; + DWORD i; TRACE("BRANCHFORWARD (%d)\n", count); for (i = 0; i < count; i++) { @@ -503,7 +503,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; case D3DOP_SETSTATUS: { - int i; + DWORD i; TRACE("SETSTATUS (%d)\n", count); for (i = 0; i < count; i++) {

1 0

Aric Stewart : usp10: Implement GPOS MarkToLigature Attachment Positioning Subtable.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 7254a0ab4c1830efecde4aa4771719b46441515b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7254a0ab4c1830efecde4aa47… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 9 13:48:59 2013 -0600 usp10: Implement GPOS MarkToLigature Attachment Positioning Subtable. --- dlls/usp10/opentype.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 127 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index c215e39..cb9832d 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -404,6 +404,29 @@ typedef struct { typedef struct { WORD PosFormat; + WORD MarkCoverage; + WORD LigatureCoverage; + WORD ClassCount; + WORD MarkArray; + WORD LigatureArray; +} GPOS_MarkLigPosFormat1; + +typedef struct { + WORD LigatureCount; + WORD LigatureAttach[1]; +} GPOS_LigatureArray; + +typedef struct { + WORD LigatureAnchor[1]; +} GPOS_ComponentRecord; + +typedef struct { + WORD ComponentCount; + GPOS_ComponentRecord ComponentRecord[1]; +} GPOS_LigatureAttach; + +typedef struct { + WORD PosFormat; WORD Mark1Coverage; WORD Mark2Coverage; WORD ClassCount; @@ -1369,6 +1392,97 @@ static VOID GPOS_apply_MarkToBase(const OT_LookupTable *look, const WORD *glyphs } } +static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, LPPOINT pt) +{ + int j; + + TRACE("MarkToLigature Attachment Positioning Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + int offset; + const GPOS_MarkLigPosFormat1 *mlpf1; + offset = GET_BE_WORD(look->SubTable[j]); + mlpf1 = (const GPOS_MarkLigPosFormat1*)((const BYTE*)look+offset); + if (GET_BE_WORD(mlpf1->PosFormat) == 1) + { + int offset = GET_BE_WORD(mlpf1->MarkCoverage); + int mark_index; + mark_index = GSUB_is_glyph_covered((const BYTE*)mlpf1+offset, glyphs[glyph_index]); + if (mark_index != -1) + { + int ligature_index; + offset = GET_BE_WORD(mlpf1->LigatureCoverage); + ligature_index = GSUB_is_glyph_covered((const BYTE*)mlpf1+offset, glyphs[glyph_index - write_dir]); + if (ligature_index != -1) + { + const GPOS_MarkArray *ma; + const GPOS_MarkRecord *mr; + + const GPOS_LigatureArray *la; + const GPOS_LigatureAttach *lt; + int mark_class; + int class_count = GET_BE_WORD(mlpf1->ClassCount); + int component_count; + int component_size; + int i; + POINT ligature_pt; + POINT mark_pt; + + TRACE("Mark %x(%i) and ligature %x(%i)\n",glyphs[glyph_index], mark_index, glyphs[glyph_index - write_dir], ligature_index); + offset = GET_BE_WORD(mlpf1->MarkArray); + ma = (const GPOS_MarkArray*)((const BYTE*)mlpf1 + offset); + if (mark_index > GET_BE_WORD(ma->MarkCount)) + { + ERR("Mark index exeeded mark count\n"); + return; + } + mr = &ma->MarkRecord[mark_index]; + mark_class = GET_BE_WORD(mr->Class); + TRACE("Mark Class %i total classes %i\n",mark_class,class_count); + offset = GET_BE_WORD(mlpf1->LigatureArray); + la = (const GPOS_LigatureArray*)((const BYTE*)mlpf1 + offset); + if (ligature_index > GET_BE_WORD(la->LigatureCount)) + { + ERR("Ligature index exeeded ligature count\n"); + return; + } + offset = GET_BE_WORD(la->LigatureAttach[ligature_index]); + lt = (const GPOS_LigatureAttach*)((const BYTE*)la + offset); + + component_count = GET_BE_WORD(lt->ComponentCount); + component_size = class_count * sizeof(WORD); + offset = 0; + for (i = 0; i < component_count && !offset; i++) + { + int k; + const GPOS_ComponentRecord *cr = (const GPOS_ComponentRecord*)((const BYTE*)lt->ComponentRecord + (component_size * i)); + for (k = 0; k < class_count && !offset; k++) + offset = GET_BE_WORD(cr->LigatureAnchor[k]); + cr = (const GPOS_ComponentRecord*)((const BYTE*)cr + component_size); + } + if (!offset) + { + ERR("Failed to find avalible ligature connection point\n"); + return; + } + + GPOS_get_anchor_values((const BYTE*)lt + offset, &ligature_pt, ppem); + offset = GET_BE_WORD(mr->MarkAnchor); + GPOS_get_anchor_values((const BYTE*)ma + offset, &mark_pt, ppem); + TRACE("Offset on ligature is %i,%i design units\n",ligature_pt.x,ligature_pt.y); + TRACE("Offset on mark is %i,%i design units\n",mark_pt.x, mark_pt.y); + pt->x += ligature_pt.x - mark_pt.x; + pt->y += ligature_pt.y - mark_pt.y; + TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + } + } + } + else + FIXME("Unhandled Mark To Ligature Format %i\n",GET_BE_WORD(mlpf1->PosFormat)); + } +} + static VOID GPOS_apply_MarkToMark(const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, LPPOINT pt) { int j; @@ -1606,6 +1720,19 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, I } break; } + case 5: + { + double devX, devY; + POINT desU = {0,0}; + GPOS_apply_MarkToLigature(look, glyphs, glyph_index, write_dir, glyph_count, ppem, &desU); + if (desU.x || desU.y) + { + GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); + pGoffset[glyph_index].du += (round(devX) - piAdvance[glyph_index-1]); + pGoffset[glyph_index].dv += round(devY); + } + break; + } case 6: { double devX, devY;

1 0

Andrew Eikum : ieframe: Strip 'file://' from file URLs in BEFORENAVIGATE2 callbacks.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 8eb70459a18f6d8a80c9570875e2c664e6afbb56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eb70459a18f6d8a80c957087… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 9 10:41:59 2013 -0600 ieframe: Strip 'file://' from file URLs in BEFORENAVIGATE2 callbacks. --- dlls/ieframe/navigate.c | 7 ++++- dlls/ieframe/tests/webbrowser.c | 49 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index dd4a976..2601ba8 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -566,6 +566,8 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, SAFEARRAY *post_data VARIANT var_url, var_flags, var_frame_name, var_post_data, var_post_data2, var_headers; DISPPARAMS dispparams; VARIANTARG params[7]; + WCHAR file_path[MAX_PATH]; + DWORD file_path_len = sizeof(file_path) / sizeof(*file_path); dispparams.cArgs = 7; dispparams.cNamedArgs = 0; @@ -607,7 +609,10 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, SAFEARRAY *post_data V_VT(params+5) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(params+5) = &var_url; V_VT(&var_url) = VT_BSTR; - V_BSTR(&var_url) = SysAllocString(url); + if(PathCreateFromUrlW(url, file_path, &file_path_len, 0) == S_OK) + V_BSTR(&var_url) = SysAllocString(file_path); + else + V_BSTR(&var_url) = SysAllocString(url); V_VT(params+6) = (VT_DISPATCH); V_DISPATCH(params+6) = (IDispatch*)This->wb; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 25cce8a..760618f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2542,6 +2542,7 @@ static void test_ConnectionPoint(IWebBrowser2 *unk, BOOL init) static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) { VARIANT url; + BOOL is_file; HRESULT hres; test_LocationURL(webbrowser, is_first_load ? "" : current_url); @@ -2551,6 +2552,9 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) V_VT(&url) = VT_BSTR; V_BSTR(&url) = a2bstr(current_url = nav_url); + if((is_file = !strncasecmp(nav_url, "file://", 7))) + current_url = nav_url + 7; + if(is_first_load) { SET_EXPECT(Invoke_AMBIENT_USERMODE); SET_EXPECT(Invoke_PROPERTYCHANGE); @@ -2578,6 +2582,7 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) SET_EXPECT(Invoke_COMMANDSTATECHANGE); SET_EXPECT(EnableModeless_TRUE); if (!use_container_olecmd) SET_EXPECT(Invoke_DOWNLOADCOMPLETE); + if (is_file) SET_EXPECT(Invoke_PROGRESSCHANGE); } hres = IWebBrowser2_Navigate2(webbrowser, &url, NULL, NULL, NULL, NULL); @@ -2609,6 +2614,7 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); if (use_container_olecmd) todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); CHECK_CALLED(EnableModeless_TRUE); + if (is_file) todo_wine CHECK_CALLED(Invoke_PROGRESSCHANGE); } VariantClear(&url); @@ -3511,6 +3517,48 @@ static BOOL is_ie_hardened(void) return ie_harden != 0; } +static void test_FileProtocol(void) +{ + IWebBrowser2 *webbrowser; + HANDLE file; + ULONG ref; + char file_path[MAX_PATH]; + char file_url[MAX_PATH] = "File://"; + + static const char test_file[] = "wine_test.html"; + + GetTempPathA(MAX_PATH, file_path); + strcat(file_path, test_file); + GetLongPathNameA(file_path, file_path, sizeof(file_path)); + strcat(file_url, file_path); + + webbrowser = create_webbrowser(); + if(!webbrowser) + return; + + init_test(webbrowser, 0); + + file = CreateFileA(file_path, GENERIC_WRITE, 0, NULL, + CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + if(file == INVALID_HANDLE_VALUE && GetLastError() != ERROR_FILE_EXISTS){ + ok(0, "CreateFile failed\n"); + return; + } + CloseHandle(file); + + test_ConnectionPoint(webbrowser, TRUE); + test_ClientSite(webbrowser, &ClientSite, TRUE); + test_DoVerb(webbrowser); + test_Navigate2(webbrowser, file_url); + test_ClientSite(webbrowser, NULL, TRUE); + + ref = IWebBrowser2_Release(webbrowser); + ok(ref == 0, "ref=%u, expected 0\n", ref); + + if(file != INVALID_HANDLE_VALUE) + DeleteFileA(file_path); +} + START_TEST(webbrowser) { OleInitialize(NULL); @@ -3536,6 +3584,7 @@ START_TEST(webbrowser) test_WebBrowser_slim_container(); trace("Testing WebBrowserV1...\n"); test_WebBrowserV1(); + test_FileProtocol(); OleUninitialize(); }

1 0

Jacek Caban : mshtml: Wine Gecko 1.9 release.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: 136b738b502f6093dbe91fff6f862c406fa43b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=136b738b502f6093dbe91fff6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 9 14:21:18 2013 +0100 mshtml: Wine Gecko 1.9 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 6 ++ dlls/mshtml/navigate.c | 5 +- dlls/mshtml/nsiface.idl | 137 +++++++++++++++++++++++++++-------------- dlls/mshtml/nsio.c | 22 ++++++- 7 files changed, 123 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=136b738b502f6093dbe91…

1 0

Alexandre Julliard : make_makefiles: Add support for Objective-C sources.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: ad16c4c0dfc45837934b319399377b98387f88d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad16c4c0dfc45837934b31939… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 9 13:07:19 2013 +0100 make_makefiles: Add support for Objective-C sources. --- tools/make_makefiles | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index be106c9..f408545 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -318,7 +318,7 @@ sub parse_makefile($) push @{$make{"=flags"}}, "manpage" if $var eq "MANPAGE"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|MC_SRCS|RC_SRCS|PO_SRCS|SVG_SRCS|PROGRAMS)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|PO_SRCS|SVG_SRCS|PROGRAMS)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -389,6 +389,7 @@ sub assign_sources_to_makefiles(@) else { if ($name =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $name; } + elsif ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; } elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $name; } @@ -501,6 +502,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "MC_SRCS" ); replace_makefile_variable( $file, "SVG_SRCS" ); replace_makefile_variable( $file, "C_SRCS" ); + replace_makefile_variable( $file, "OBJC_SRCS" ); replace_makefile_variable( $file, "RC_SRCS" ); replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" ); replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" );

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
74
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 January 2013