wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Dmitry Timoshkov : ntdll: Make NtWriteFile explicitly check for negative offset and fail.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: b314a253203127a38613d844dc05a82141093cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b314a253203127a38613d844d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 13 15:45:44 2013 +0900 ntdll: Make NtWriteFile explicitly check for negative offset and fail. --- dlls/ntdll/file.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index dd67b3d..2d07255 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -982,6 +982,11 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, } off = st.st_size; } + else if (offset->QuadPart < 0) + { + status = STATUS_INVALID_PARAMETER; + goto done; + } /* async I/O doesn't make sense on regular files */ while ((result = pwrite( unix_handle, buffer, length, off )) == -1)

1 0

Dmitry Timoshkov : ntdll: NtWriteFile should fail for overlapped IO on files if offset is negative.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 9e50cc540ac04a0ef5789c170dc62ee30f35bd4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e50cc540ac04a0ef5789c170… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 13 15:45:37 2013 +0900 ntdll: NtWriteFile should fail for overlapped IO on files if offset is negative. --- dlls/ntdll/file.c | 2 +- dlls/ntdll/tests/file.c | 14 -------------- 2 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index f7f80e6..dd67b3d 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -961,7 +961,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (type == FD_TYPE_FILE) { - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && !offset) + if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0)) { status = STATUS_INVALID_PARAMETER; goto done; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 0b2a764..120fdac 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2198,9 +2198,6 @@ todo_wine for (i = -20; i < -1; i++) { - /* FIXME: Remove once Wine is fixed */ - if (i == -2) continue; - iob.Status = -1; iob.Information = -1; offset.QuadPart = (LONGLONG)i; @@ -2212,17 +2209,6 @@ todo_wine iob.Status = -1; iob.Information = -1; - offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; - status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); -todo_wine - ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); -todo_wine - ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); -todo_wine - ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); - - iob.Status = -1; - iob.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); todo_wine

1 0

Nikolay Sivov : ntdll: Added compatible ProgID section.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 84d9b2502e3d57aa89970d04dda04df507fd4c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d9b2502e3d57aa89970d04d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 13 11:06:51 2013 +0400 ntdll: Added compatible ProgID section. --- dlls/kernel32/tests/actctx.c | 5 - dlls/ntdll/actctx.c | 248 +++++++++++++++++++++++++++++++++++++++++- dlls/ole32/tests/compobj.c | 18 +++ 3 files changed, 265 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84d9b2502e3d57aa89970…

1 0

Nikolay Sivov : kernel32/tests: Some tests for ProgID section.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: b8a973dc526b8dc3ed9265b13cc63403b04eaa47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a973dc526b8dc3ed9265b13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 13 00:14:37 2013 +0400 kernel32/tests: Some tests for ProgID section. --- dlls/kernel32/tests/actctx.c | 117 ++++++++++++++++++++++++++++++++++++++--- dlls/ntdll/actctx.c | 13 +++-- 2 files changed, 116 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8a973dc526b8dc3ed926…

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 15b6ff20236e4546b1c5e9c4b0f657f59ff54d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b6ff20236e4546b1c5e9c4b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 12 23:55:46 2013 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw4.c | 8 ++++---- dlls/ddraw/tests/ddraw7.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 21a2d40..348b13c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4063,9 +4063,9 @@ static void test_block_formats_creation(void) ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; ddsd.ddsCaps.dwCaps = types[j].caps; ddsd.ddsCaps.dwCaps2 = types[j].caps2; - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); - ddsd.ddpfPixelFormat.dwFlags = DDPF_FOURCC; - ddsd.ddpfPixelFormat.dwFourCC = formats[i].fourcc; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(ddsd).ddpfPixelFormat.dwFourCC = formats[i].fourcc; ddsd.dwWidth = w; ddsd.dwHeight = h; @@ -4189,7 +4189,7 @@ static void test_unsupported_formats(void) memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddpfPixelFormat = formats[i].fmt; + U4(ddsd).ddpfPixelFormat = formats[i].fmt; ddsd.dwWidth = 4; ddsd.dwHeight = 4; ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | caps[j]; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ebfb16f..7f75cc7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3876,9 +3876,9 @@ static void test_block_formats_creation(void) ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; ddsd.ddsCaps.dwCaps = types[j].caps; ddsd.ddsCaps.dwCaps2 = types[j].caps2; - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); - ddsd.ddpfPixelFormat.dwFlags = DDPF_FOURCC; - ddsd.ddpfPixelFormat.dwFourCC = formats[i].fourcc; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(ddsd).ddpfPixelFormat.dwFourCC = formats[i].fourcc; ddsd.dwWidth = w; ddsd.dwHeight = h; @@ -4002,7 +4002,7 @@ static void test_unsupported_formats(void) memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddpfPixelFormat = formats[i].fmt; + U4(ddsd).ddpfPixelFormat = formats[i].fmt; ddsd.dwWidth = 4; ddsd.dwHeight = 4; ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | caps[j];

1 0

Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 51e717345bd2d076a9918b8b804eb31957f1fb4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e717345bd2d076a9918b8b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 12 23:55:23 2013 +0200 oleaut32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/oleaut32/tests/typelib.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 17a3b99..e1ede75 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4224,8 +4224,8 @@ static void test_SetVarHelpContext(void) ok(pdesc->memid == 0x40000000, "got wrong memid: %x\n", pdesc->memid); ok(pdesc->elemdescVar.tdesc.vt == VT_INT, "got wrong vardesc type: %u\n", pdesc->elemdescVar.tdesc.vt); ok(pdesc->varkind == VAR_CONST, "got wrong varkind: %u\n", pdesc->varkind); - ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); - ok(V_INT(U(pdesc)->lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(pdesc)->lpvarValue)); + ok(V_VT(U(*pdesc).lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(*pdesc).lpvarValue)); + ok(V_INT(U(*pdesc).lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(*pdesc).lpvarValue)); hr = ITypeInfo_GetDocumentation(ti, pdesc->memid, NULL, NULL, &ctx, NULL); ok(hr == S_OK, "got %08x\n", hr); @@ -4409,8 +4409,8 @@ static void test_SetVarDocString(void) ok(pdesc->memid == 0x40000000, "got wrong memid: %x\n", pdesc->memid); ok(pdesc->elemdescVar.tdesc.vt == VT_INT, "got wrong vardesc type: %u\n", pdesc->elemdescVar.tdesc.vt); ok(pdesc->varkind == VAR_CONST, "got wrong varkind: %u\n", pdesc->varkind); - ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); - ok(V_INT(U(pdesc)->lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(pdesc)->lpvarValue)); + ok(V_VT(U(*pdesc).lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(*pdesc).lpvarValue)); + ok(V_INT(U(*pdesc).lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(*pdesc).lpvarValue)); hr = ITypeInfo_GetDocumentation(ti, pdesc->memid, &namestr, &docstr, NULL, NULL); ok(hr == S_OK, "got %08x\n", hr);

1 0

Huw Davies : Don't save the selected state.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: fontforge Branch: master Commit: bd54d56438ffeb436e73f262440bc716d969e8c9 URL: http://source.winehq.org/git/fontforge.git/?a=commit;h=bd54d56438ffeb436e73… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 13 11:27:45 2013 +0100 Don't save the selected state. --- fontforge/sfd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fontforge/sfd.c b/fontforge/sfd.c index aa19b78..96e2bb4 100644 --- a/fontforge/sfd.c +++ b/fontforge/sfd.c @@ -620,7 +620,7 @@ static void SFDDumpSplineSet(FILE *sfd,SplineSet *spl) { (double) sp->prevcp.x, (double) sp->prevcp.y, (double) sp->me.x, (double) sp->me.y ); #endif - fprintf(sfd, "%d", sp->pointtype|(sp->selected<<2)| + fprintf(sfd, "%d", sp->pointtype|/*(sp->selected<<2)|*/ (sp->nextcpdef<<3)|(sp->prevcpdef<<4)| (sp->roundx<<5)|(sp->roundy<<6)| (sp->ttfindex==0xffff?(1<<7):0)|

1 0

André Hentschel : wineusr: Add a note about access rights to unix devices.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: docs Branch: master Commit: 0bc3120e0f929acd4a1437daede1b9de385f53a2 URL: http://source.winehq.org/git/docs.git/?a=commit;h=0bc3120e0f929acd4a1437dae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 11 21:45:53 2013 +0200 wineusr: Add a note about access rights to unix devices. --- en/wineusr-configuring.sgml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 1be0389..ff54fa5 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -606,7 +606,8 @@ ln -sf /usr/local/etc/wine.systemreg system.reg number, such as <filename class="devicefile">lpt1</filename>. You should link these directly to the corresponding Unix devices, such as <filename class="devicefile">/dev/ttyS0</filename> and - <filename class="devicefile">/dev/lp0</filename>. For example, to configure + <filename class="devicefile">/dev/lp0</filename>. Make sure you have the needed + access rights to that device. For example, to configure one serial port and one parallel port, run the following commands: <screen> ln -s /dev/ttyS0 com1 @@ -618,7 +619,7 @@ ln -s /dev/lp0 lpt1 <title>Network Shares</title> <para> - Windows shares can are mapped into the <filename class="directory">unc/</filename> + Windows shares can be mapped into the <filename class="directory">unc/</filename> directory so anything trying to access <filename>\\<replaceable>myserver</replaceable>\<replaceable>some</replaceable>\<replaceable>file</replaceable></filename> will look in

1 0

Aric Stewart : gdi32: ABC value signs remain the same despite any changes in layout direction or viewport .
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 3f4ef58b0fdb771ffacb64812c32aa625892a16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4ef58b0fdb771ffacb64812… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 12 13:01:56 2013 -0500 gdi32: ABC value signs remain the same despite any changes in layout direction or viewport. --- dlls/gdi32/font.c | 19 +++++---- dlls/gdi32/tests/font.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 104 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 68b2713..7fd5bd3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2700,9 +2700,9 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, { /* convert device units to logical */ for( i = firstChar; i <= lastChar; i++, abc++ ) { - abc->abcA = INTERNAL_XDSTOWS(dc, abc->abcA); - abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB); - abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC); + abc->abcA = width_to_LP(dc, abc->abcA); + abc->abcB = width_to_LP(dc, abc->abcB); + abc->abcC = width_to_LP(dc, abc->abcC); } } @@ -2752,9 +2752,9 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count, { /* convert device units to logical */ for( i = 0; i < count; i++, abc++ ) { - abc->abcA = INTERNAL_XDSTOWS(dc, abc->abcA); - abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB); - abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC); + abc->abcA = width_to_LP(dc, abc->abcA); + abc->abcB = width_to_LP(dc, abc->abcB); + abc->abcC = width_to_LP(dc, abc->abcC); } } @@ -3352,11 +3352,12 @@ BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, LPABCFLOAT a if (ret) { /* convert device units to logical */ + FLOAT scale = fabs( dc->xformVport2World.eM11 ); for (i = first; i <= last; i++, abcf++) { - abcf->abcfA = abc[i - first].abcA * dc->xformVport2World.eM11; - abcf->abcfB = abc[i - first].abcB * dc->xformVport2World.eM11; - abcf->abcfC = abc[i - first].abcC * dc->xformVport2World.eM11; + abcf->abcfA = abc[i - first].abcA * scale; + abcf->abcfB = abc[i - first].abcB * scale; + abcf->abcfC = abc[i - first].abcC * scale; } } HeapFree( GetProcessHeap(), 0, abc ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 11299f3..99c5eef 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1113,17 +1113,50 @@ static int CALLBACK create_font_proc(const LOGFONT *lpelfe, return 1; } +static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, ABC *base_abci, ABC *base_abcw, ABCFLOAT *base_abcf, INT todo) +{ + ABC abc[1]; + ABCFLOAT abcf[1]; + BOOL ret = FALSE; + + ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); + ok(ret, "%s: GetCharABCWidthsI should have succeeded\n", description); + ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); + if (todo) todo_wine ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + else ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + if (todo) todo_wine ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + else ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + + ret = pGetCharABCWidthsW(hdc, 'i', 'i', abc); + ok(ret, "%s: GetCharABCWidthsW should have succeeded\n", description); + ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); + if (todo) todo_wine ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + else ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + if (todo) todo_wine ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + else ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's should be unchanged\n", description); + + ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); + ok(ret, "%s: GetCharABCWidthsFloatW should have succeeded\n", description); + ok (abcf->abcfB > 0.0, "%s: abcfB should be positive\n", description); + if (todo) todo_wine ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's sign should be unchanged\n", description); + else ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's should be unchanged\n", description); + if (todo) todo_wine ok(abcf->abcfC * base_abcf->abcfC >= 0.0, "%s: abcfC's sign should be unchanged\n", description); + else ok(abcf->abcfC * base_abcf->abcfC >= 0.0, "%s: abcfC's sign should be unchanged\n", description); +} + static void test_GetCharABCWidths(void) { - static const WCHAR str[] = {'a',0}; + static const WCHAR str[] = {'i',0}; BOOL ret; HDC hdc; LOGFONTA lf; HFONT hfont; ABC abc[1]; + ABC abcw[1]; ABCFLOAT abcf[1]; WORD glyphs[1]; DWORD nb; + HWND hwnd; static const struct { UINT first; @@ -1266,6 +1299,66 @@ static void test_GetCharABCWidths(void) } ReleaseDC(NULL, hdc); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = 20; + + trace("ABC sign test for a varity of transforms:\n"); + hfont = CreateFontIndirectA(&lf); + hwnd = CreateWindowEx(0, "static", "", WS_POPUP, 0,0,100,100, + 0, 0, 0, NULL); + hdc = GetDC(hwnd); + SetMapMode(hdc, MM_ANISOTROPIC); + SelectObject(hdc, hfont); + + nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); + ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); + + ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); + ok(ret, "GetCharABCWidthsI should have succeeded\n"); + ret = pGetCharABCWidthsW(hdc, 'i', 'i', abcw); + ok(ret, "GetCharABCWidthsI should have succeeded\n"); + ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); + ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); + + ABCWidths_helper("LTR", hdc, glyphs, abc, abcw, abcf, 0); + SetWindowExtEx(hdc, -1, -1, NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ABCWidths_helper("LTR -1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + SetGraphicsMode(hdc, GM_ADVANCED); + ABCWidths_helper("LTR -1 advanced", hdc, glyphs, abc, abcw, abcf, 1); + SetWindowExtEx(hdc, 1, 1, NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ABCWidths_helper("LTR 1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + SetGraphicsMode(hdc, GM_ADVANCED); + ABCWidths_helper("LTR 1 advanced", hdc, glyphs, abc, abcw, abcf, 0); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + + trace("RTL layout\n"); + hwnd = CreateWindowEx(WS_EX_LAYOUTRTL, "static", "", WS_POPUP, 0,0,100,100, + 0, 0, 0, NULL); + hdc = GetDC(hwnd); + SetMapMode(hdc, MM_ANISOTROPIC); + SelectObject(hdc, hfont); + + ABCWidths_helper("RTL", hdc, glyphs, abc, abcw, abcf, 0); + SetWindowExtEx(hdc, -1, -1, NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ABCWidths_helper("RTL -1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + SetGraphicsMode(hdc, GM_ADVANCED); + ABCWidths_helper("RTL -1 advanced", hdc, glyphs, abc, abcw, abcf, 0); + SetWindowExtEx(hdc, 1, 1, NULL); + SetGraphicsMode(hdc, GM_COMPATIBLE); + ABCWidths_helper("RTL 1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + SetGraphicsMode(hdc, GM_ADVANCED); + ABCWidths_helper("RTL 1 advanced", hdc, glyphs, abc, abcw, abcf, 1); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + DeleteObject(hfont); } static void test_text_extents(void)

1 0

Andrew Eikum : mshtml: Free advpack after use.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 93c01b81882df7c8ff887dcb7786f5235f5b6969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c01b81882df7c8ff887dcb7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 12 10:58:57 2013 -0500 mshtml: Free advpack after use. --- dlls/mshtml/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index f81255a..4c7c489 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -461,6 +461,8 @@ static HRESULT register_server(BOOL do_register) hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable); + FreeLibrary(hAdvpack); + for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) heap_free(pse[i].pszValue);

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
65
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 September 2013