January 2013 - Wine-commits

Piotr Caban : msvcrt: Added more read tests.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 62bd615452cc0216c54b7707b1102f8511938d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=62bd615452cc0216c54b7707b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:45:20 2013 +0100 msvcrt: Added more read tests. --- dlls/msvcrt/tests/file.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 7928b9e..7304b34 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -956,6 +956,11 @@ static void test_file_write_read( void ) _lseek(tempfd, -2, FILE_END); ret = _read(tempfd,btext,LLEN); ok(ret == 1 && *btext == '\n', "_read expected '\\n' got bad length: %d\n", ret); + _lseek(tempfd, -2, FILE_END); + ret = _read(tempfd,btext,1); + ok(ret == 1 && *btext == '\n', "_read returned %d, buf: %d\n", ret, *btext); + ret = read(tempfd,btext,1); + ok(ret == 0, "_read returned %d, expected 0\n", ret); _lseek(tempfd, -3, FILE_END); ret = _read(tempfd,btext,1); ok(ret == 1 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); @@ -1784,6 +1789,29 @@ static void test_pipes(const char* selfname) i=fclose(file); ok(!i, "unable to close the pipe: %d\n", errno); + + if (_pipe(pipes, 1024, O_BINARY) < 0) + { + ok(0, "pipe failed with errno %d\n", errno); + return; + } + r = write(pipes[1], "\r\n\rab", 5); + ok(r == 5, "write returned %d, errno = %d\n", r, errno); + setmode(pipes[0], O_TEXT); + r = read(pipes[0], buf, 1); + ok(r == 1, "read returned %d, expected 1\n", r); + ok(buf[0] == '\n', "buf[0] = %x, expected '\\n'\n", buf[0]); + r = read(pipes[0], buf, 1); + ok(r == 1, "read returned %d, expected 1\n", r); + ok(buf[0] == '\r', "buf[0] = %x, expected '\\r'\n", buf[0]); + r = read(pipes[0], buf, 1); + ok(r == 1, "read returned %d, expected 1\n", r); + ok(buf[0] == 'a', "buf[0] = %x, expected 'a'\n", buf[0]); + r = read(pipes[0], buf, 1); + ok(r == 1, "read returned %d, expected 1\n", r); + ok(buf[0] == 'b', "buf[0] = %x, expected 'b'\n", buf[0]); + close(pipes[1]); + close(pipes[0]); } static void test_unlink(void)

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

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 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

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

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

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

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

Austin English : include: Add D3D_DRIVER_TYPE to d3dcommon.idl.
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: f8582e10278b3549e627c6d01e85edef912b50c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8582e10278b3549e627c6d01… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 8 18:58:23 2013 -0800 include: Add D3D_DRIVER_TYPE to d3dcommon.idl. --- include/d3dcommon.idl | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 598abd5..76f66f5 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -68,6 +68,16 @@ interface ID3DInclude typedef ID3DInclude* LPD3DINCLUDE; +typedef enum D3D_DRIVER_TYPE +{ + D3D_DRIVER_TYPE_UNKNOWN, + D3D_DRIVER_TYPE_HARDWARE, + D3D_DRIVER_TYPE_REFERENCE, + D3D_DRIVER_TYPE_NULL, + D3D_DRIVER_TYPE_SOFTWARE, + D3D_DRIVER_TYPE_WARP, +} D3D_DRIVER_TYPE; + typedef enum D3D_FEATURE_LEVEL { D3D_FEATURE_LEVEL_9_1 = 0x9100,

1 0

Christian Costa : d3dx9_36: Finish implementation of ID3DXFileImpl_CreateEnumObject and add stubbed interface for ID3DXFileData .
by Alexandre Julliard 09 Jan '13

09 Jan '13

Module: wine Branch: master Commit: ba6932459a37de8f4c10beda265ecd2907708c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6932459a37de8f4c10beda2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Jan 9 10:22:33 2013 +0100 d3dx9_36: Finish implementation of ID3DXFileImpl_CreateEnumObject and add stubbed interface for ID3DXFileData. --- dlls/d3dx9_36/xfile.c | 260 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 255 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index aaf1391..5db7800 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -53,8 +53,17 @@ typedef struct { typedef struct { ID3DXFileEnumObject ID3DXFileEnumObject_iface; LONG ref; + ULONG nb_children; + ID3DXFileData **children; } ID3DXFileEnumObjectImpl; +typedef struct { + ID3DXFileData ID3DXFileData_iface; + LONG ref; + IDirectXFileData *dxfile_data; +} ID3DXFileDataImpl; + + static inline ID3DXFileImpl* impl_from_ID3DXFile(ID3DXFile *iface) { return CONTAINING_RECORD(iface, ID3DXFileImpl, ID3DXFile_iface); @@ -65,6 +74,169 @@ static inline ID3DXFileEnumObjectImpl* impl_from_ID3DXFileEnumObject(ID3DXFileEn return CONTAINING_RECORD(iface, ID3DXFileEnumObjectImpl, ID3DXFileEnumObject_iface); } +static inline ID3DXFileDataImpl* impl_from_ID3DXFileData(ID3DXFileData *iface) +{ + return CONTAINING_RECORD(iface, ID3DXFileDataImpl, ID3DXFileData_iface); +} + +/*** IUnknown methods ***/ + +static HRESULT WINAPI ID3DXFileDataImpl_QueryInterface(ID3DXFileData *iface, REFIID riid, void **ret_iface) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ID3DXFileData)) + { + iface->lpVtbl->AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + WARN("(%p)->(%s, %p), not found\n", iface, debugstr_guid(riid), ret_iface); + *ret_iface = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ID3DXFileDataImpl_AddRef(ID3DXFileData *iface) +{ + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ID3DXFileDataImpl_Release(ID3DXFileData *iface) +{ + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + if (!ref) + { + IDirectXFileData_Release(This->dxfile_data); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + + +/*** ID3DXFileData methods ***/ + +static HRESULT WINAPI ID3DXFileDataImpl_GetEnum(ID3DXFileData *iface, ID3DXFileEnumObject **enum_object) +{ + FIXME("(%p)->(%p): stub\n", iface, enum_object); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_GetName(ID3DXFileData *iface, char *name, SIZE_T *size) +{ + FIXME("(%p)->(%p, %p): stub\n", iface, name, size); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_GetId(ID3DXFileData *iface, GUID *guid) +{ + FIXME("(%p)->(%p): stub\n", iface, guid); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_Lock(ID3DXFileData *iface, SIZE_T *size, const void **data) +{ + FIXME("(%p)->(%p, %p): stub\n", iface, size, data); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_Unlock(ID3DXFileData *iface) +{ + FIXME("(%p)->(): stub\n", iface); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID *guid) +{ + FIXME("(%p)->(%p): stub\n", iface, guid); + + return E_NOTIMPL; +} + + +static BOOL WINAPI ID3DXFileDataImpl_IsReference(ID3DXFileData *iface) +{ + TRACE("(%p)->(): stub\n", iface); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_GetChildren(ID3DXFileData *iface, SIZE_T *children) +{ + TRACE("(%p)->(%p): stub\n", iface, children); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_GetChild(ID3DXFileData *iface, SIZE_T id, ID3DXFileData **object) +{ + TRACE("(%p)->(%lu, %p): stub\n", iface, id, object); + + return E_NOTIMPL; +} + + +static const ID3DXFileDataVtbl ID3DXFileData_Vtbl = +{ + ID3DXFileDataImpl_QueryInterface, + ID3DXFileDataImpl_AddRef, + ID3DXFileDataImpl_Release, + ID3DXFileDataImpl_GetEnum, + ID3DXFileDataImpl_GetName, + ID3DXFileDataImpl_GetId, + ID3DXFileDataImpl_Lock, + ID3DXFileDataImpl_Unlock, + ID3DXFileDataImpl_GetType, + ID3DXFileDataImpl_IsReference, + ID3DXFileDataImpl_GetChildren, + ID3DXFileDataImpl_GetChild +}; + + +static HRESULT ID3DXFileDataImpl_Create(IDirectXFileData *dxfile_data, ID3DXFileData **ret_iface) +{ + ID3DXFileDataImpl *object; + + TRACE("(%p, %p)\n", dxfile_data, ret_iface); + + *ret_iface = NULL; + + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->ID3DXFileData_iface.lpVtbl = &ID3DXFileData_Vtbl; + object->ref = 1; + object->dxfile_data = dxfile_data; + + *ret_iface = &object->ID3DXFileData_iface; + + return S_OK; +} + /*** IUnknown methods ***/ @@ -90,7 +262,7 @@ static ULONG WINAPI ID3DXFileEnumObjectImpl_AddRef(ID3DXFileEnumObject *iface) ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref %u\n", iface, ref); + TRACE("(%p)->(): new ref = %u\n", iface, ref); return ref; } @@ -100,10 +272,17 @@ static ULONG WINAPI ID3DXFileEnumObjectImpl_Release(ID3DXFileEnumObject *iface) ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref %u\n", iface, ref); + TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) + { + ULONG i; + + for (i = 0; i < This->nb_children; i++) + (This->children[i])->lpVtbl->Release(This->children[i]); + HeapFree(GetProcessHeap(), 0, This->children); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -189,7 +368,7 @@ static ULONG WINAPI ID3DXFileImpl_AddRef(ID3DXFile *iface) ID3DXFileImpl *This = impl_from_ID3DXFile(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref %d\n", iface, ref); + TRACE("(%p)->(): new ref = %u\n", iface, ref); return ref; } @@ -200,7 +379,7 @@ static ULONG WINAPI ID3DXFileImpl_Release(ID3DXFile *iface) ID3DXFileImpl *This = impl_from_ID3DXFile(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref %d\n", iface, ref); + TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) { @@ -216,15 +395,53 @@ static ULONG WINAPI ID3DXFileImpl_Release(ID3DXFile *iface) static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const void *source, D3DXF_FILELOADOPTIONS options, ID3DXFileEnumObject **enum_object) { + ID3DXFileImpl *This = impl_from_ID3DXFile(iface); ID3DXFileEnumObjectImpl *object; + IDirectXFileEnumObject *dxfile_enum_object; + void *dxfile_source; + DXFILELOADOPTIONS dxfile_options; + DXFILELOADRESOURCE dxfile_resource; + DXFILELOADMEMORY dxfile_memory; + IDirectXFileData *data_object; + HRESULT ret; - FIXME("(%p)->(%p, %x, %p): partial stub\n", iface, source, options, enum_object); + TRACE("(%p)->(%p, %x, %p)\n", iface, source, options, enum_object); if (!enum_object) return E_POINTER; *enum_object = NULL; + if (options == D3DXF_FILELOAD_FROMFILE) + { + dxfile_source = (void*)source; + dxfile_options = DXFILELOAD_FROMFILE; + } + else if (options == D3DXF_FILELOAD_FROMRESOURCE) + { + D3DXF_FILELOADRESOURCE *resource = (D3DXF_FILELOADRESOURCE*)source; + + dxfile_resource.hModule = resource->hModule; + dxfile_resource.lpName = resource->lpName; + dxfile_resource.lpType = resource->lpType; + dxfile_source = &dxfile_resource; + dxfile_options = DXFILELOAD_FROMRESOURCE; + } + else if (options == D3DXF_FILELOAD_FROMMEMORY) + { + D3DXF_FILELOADMEMORY *memory = (D3DXF_FILELOADMEMORY*)source; + + dxfile_memory.lpMemory = memory->lpMemory; + dxfile_memory.dSize = memory->dSize; + dxfile_source = &dxfile_memory; + dxfile_options = DXFILELOAD_FROMMEMORY; + } + else + { + FIXME("Source type %u is not handled yet\n", options); + return E_NOTIMPL; + } + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -232,6 +449,39 @@ static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const voi object->ID3DXFileEnumObject_iface.lpVtbl = &ID3DXFileEnumObject_Vtbl; object->ref = 1; + ret = IDirectXFile_CreateEnumObject(This->dxfile, dxfile_source, dxfile_options, &dxfile_enum_object); + + if (ret != S_OK) + { + HeapFree(GetProcessHeap(), 0, object); + return ret; + } + + /* Fill enum object with top level data objects */ + while (SUCCEEDED(ret = IDirectXFileEnumObject_GetNextDataObject(dxfile_enum_object, &data_object))) + { + if (object->children) + object->children = HeapReAlloc(GetProcessHeap(), 0, object->children, sizeof(*object->children) * (object->nb_children + 1)); + else + object->children = HeapAlloc(GetProcessHeap(), 0, sizeof(*object->children)); + if (!object->children) + { + ret = E_OUTOFMEMORY; + break; + } + ret = ID3DXFileDataImpl_Create(data_object, &object->children[object->nb_children]); + if (ret != S_OK) + break; + object->nb_children++; + } + + IDirectXFileEnumObject_Release(dxfile_enum_object); + + if (ret != DXFILEERR_NOMOREOBJECTS) + WARN("Cannot get all top level data objects\n"); + + TRACE("Found %u children\n", object->nb_children); + *enum_object = &object->ID3DXFileEnumObject_iface; return S_OK;

1 0