January 2011 - Wine-Commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: d09218d503d63d67c9a89d6f4a60d0597b041c94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09218d503d63d67c9a89d6f4… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Jan 14 21:23:06 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 106 +++++++++++++++++++------------------------------------------ 1 files changed, 33 insertions(+), 73 deletions(-) diff --git a/po/lt.po b/po/lt.po index 308e5a6..9a38b5a 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-01-13 20:37+0300\n" +"PO-Revision-Date: 2011-01-14 21:21+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)gmail.com>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -172,13 +172,8 @@ msgid "Desktop" msgstr "Darbalaukis" #: comdlg32.rc:35 winhlp32.rc:52 winhlp32.rc:75 -#, fuzzy msgid "Fonts" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Šriftas\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Šriftai" +msgstr "Šriftai" #: comdlg32.rc:36 shell32.rc:142 regedit.rc:206 msgid "My Computer" @@ -430,13 +425,8 @@ msgid "Open File" msgstr "Atverti failą" #: comdlg32.rc:93 oleview.rc:95 -#, fuzzy msgid "Ready" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Parengta\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Parengtas" +msgstr "Parengta" #: comdlg32.rc:94 msgid "Paused; " @@ -3251,13 +3241,8 @@ msgstr "&Užverti" #: shdocvw.rc:42 shell32.rc:40 shell32.rc:105 oleview.rc:58 oleview.rc:82 #: regedit.rc:65 taskmgr.rc:52 winefile.rc:76 wordpad.rc:66 -#, fuzzy msgid "&View" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Rodymas\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Rodinys" +msgstr "&Rodymas" #: shdocvw.rc:44 msgid "&Toolbars" @@ -3276,13 +3261,8 @@ msgid "&Favorites" msgstr "&Adresynas" #: shdocvw.rc:52 regedit.rc:75 -#, fuzzy msgid "&Add to Favorites..." -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Į&rašyti į adresyną...\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Pri&dėti į adresyną..." +msgstr "Į&rašyti į adresyną..." #: shdocvw.rc:55 shell32.rc:113 notepad.rc:57 oleview.rc:69 progman.rc:52 #: regedit.rc:78 taskmgr.rc:87 winefile.rc:130 winhlp32.rc:60 wordpad.rc:91 @@ -3382,7 +3362,6 @@ msgstr "&Pervadinti" #: shell32.rc:102 notepad.rc:36 oleview.rc:35 regedit.rc:41 view.rc:31 #: winhlp32.rc:34 wordpad.rc:37 -#, fuzzy msgid "E&xit" msgstr "Iš&eiti" @@ -3439,13 +3418,8 @@ msgid "Select" msgstr "Iš&rinkti" #: shell32.rc:152 oleview.rc:99 -#, fuzzy msgid "Open" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Atverti\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Atverti" +msgstr "Atverti" #: shell32.rc:173 msgid "Restart" @@ -5562,19 +5536,19 @@ msgstr "%s %S %S Atverti ištekliai: %lu\n" #: notepad.rc:27 msgid "&New\tCtrl+N" -msgstr "&Naujas\tCtrl+N" +msgstr "&Naujas\tVald+N" #: notepad.rc:28 wordpad.rc:29 msgid "&Open...\tCtrl+O" -msgstr "&Atverti...\tCtrl+O" +msgstr "&Atverti...\tVald+O" #: notepad.rc:29 wordpad.rc:30 msgid "&Save\tCtrl+S" -msgstr "&Išsaugoti\tCtrl+S" +msgstr "&Išsaugoti\tVald+S" #: notepad.rc:32 wordpad.rc:33 msgid "&Print...\tCtrl+P" -msgstr "S&pausdinti...\tCtrl+P" +msgstr "S&pausdinti...\tVald+P" #: notepad.rc:33 wordpad.rc:35 msgid "Page Se&tup..." @@ -5590,19 +5564,19 @@ msgstr "&Taisa" #: notepad.rc:39 wordpad.rc:41 msgid "&Undo\tCtrl+Z" -msgstr "&Atšaukti\tCtrl+Z" +msgstr "&Atšaukti\tVald+Z" #: notepad.rc:41 wordpad.rc:44 msgid "Cu&t\tCtrl+X" -msgstr "&Iškirpti\tCtrl+X" +msgstr "&Iškirpti\tVald+X" #: notepad.rc:42 wordpad.rc:45 msgid "&Copy\tCtrl+C" -msgstr "&Kopijuoti\tCtrl+C" +msgstr "&Kopijuoti\tVald+C" #: notepad.rc:43 wordpad.rc:46 msgid "&Paste\tCtrl+V" -msgstr "Į&dėti\tCtrl+V" +msgstr "Į&dėti\tVald+V" #: notepad.rc:44 progman.rc:34 regedit.rc:57 regedit.rc:93 regedit.rc:108 #: winefile.rc:30 @@ -5611,7 +5585,7 @@ msgstr "&Šalinti\tDel" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "&Pažymėti viską\tCtrl+A" +msgstr "&Pažymėti viską\tVald+A" #: notepad.rc:47 msgid "&Time/Date\tF5" @@ -5623,7 +5597,7 @@ msgstr "Skaidyti ilgas &eilutes" #: notepad.rc:53 msgid "&Search...\tCtrl+F" -msgstr "&Ieškoti...\tCtrl+F" +msgstr "&Ieškoti...\tVald+F" #: notepad.rc:54 msgid "&Search next\tF3" @@ -5631,7 +5605,7 @@ msgstr "Ieškoti ki&to\tF3" #: notepad.rc:55 wordpad.rc:52 msgid "&Replace...\tCtrl+H" -msgstr "Pa&keisti...\tCtrl+H" +msgstr "Pa&keisti...\tVald+H" #: notepad.rc:59 progman.rc:54 msgid "&Search..." @@ -5836,13 +5810,8 @@ msgid "&Status Bar" msgstr "&Būsenos juosta" #: oleview.rc:67 regedit.rc:71 winefile.rc:127 -#, fuzzy msgid "&Refresh\tF5" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"At&naujinti\tF5\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Atnaujinti\tF5" +msgstr "At&naujinti\tF5" #: oleview.rc:71 msgid "&About OleView" @@ -5873,7 +5842,6 @@ msgid "version 1.0" msgstr "versija 1.0" #: oleview.rc:100 -#, fuzzy msgid "TypeLib files (*.tlb;*.olb;*.dll;*.ocx;*.exe)" msgstr "TypeLib failai (*.tlb;*.olb;*.dll;*.ocx;*.exe)" @@ -6088,11 +6056,11 @@ msgstr "&Langai" #: progman.rc:47 msgid "&Overlapped\tShift+F5" -msgstr "&Persikloję\tShift+F5" +msgstr "&Persikloję\tLyg2+F5" #: progman.rc:48 msgid "&Side by side\tShift+F4" -msgstr "&Greta vienas kito\tShift+F4" +msgstr "&Greta vienas kito\tLyg2+F4" #: progman.rc:49 msgid "&Arrange Icons" @@ -6245,7 +6213,7 @@ msgstr "&Atjungti registrą tinkle..." #: regedit.rc:39 msgid "&Print\tCtrl+P" -msgstr "S&pausdinti\tCtrl+P" +msgstr "S&pausdinti\tVald+P" #: regedit.rc:45 regedit.rc:90 msgid "&Modify" @@ -6281,7 +6249,7 @@ msgstr "Kopijuoti rakto &vardą" #: regedit.rc:62 regedit.rc:114 msgid "&Find\tCtrl+F" -msgstr "&Ieškoti\tCtrl+F" +msgstr "&Ieškoti\tVald+F" #: regedit.rc:63 msgid "Find Ne&xt\tF3" @@ -6305,13 +6273,8 @@ msgid "&Remove Favorite..." msgstr "&Pašalinti iš adresyno..." #: regedit.rc:80 winefile.rc:131 -#, fuzzy msgid "&Help Topics\tF1" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Žinyno &temos\tF1\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Žinyno temos\tF1" +msgstr "&Žinyno temos\tF1" #: regedit.rc:82 msgid "&About Registry Editor" @@ -6368,12 +6331,10 @@ msgid "Export Registry File" msgstr "Eksportuoti registro failą" #: regedit.rc:199 -#, fuzzy msgid "Registry files (*.reg)" msgstr "Registro failai (*.reg)" #: regedit.rc:200 -#, fuzzy msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4 registro failai (REGEDIT4)" @@ -7901,9 +7862,8 @@ msgid "Expand &Tree\t*" msgstr "Išskleisti &medį\t*" #: winefile.rc:70 -#, fuzzy msgid "Expand &all\tCtrl+*" -msgstr "Išskleisti &viską\tStrg+*" +msgstr "Išskleisti &viską\tVald+*" #: winefile.rc:71 msgid "Collapse &Tree\t-" @@ -7971,7 +7931,7 @@ msgstr "&Diskų juosta" #: winefile.rc:104 msgid "F&ull Screen\tCtrl+Shift+S" -msgstr "&Visas ekranas\tCtrl+Shift+S" +msgstr "&Visas ekranas\tVald+Lyg2+S" #: winefile.rc:112 msgid "&Security" @@ -7995,11 +7955,11 @@ msgstr "Naujas &langas" #: winefile.rc:120 msgid "Cascading\tCtrl+F5" -msgstr "Išdėstyti pa&kopomis\tCtrl+F5" +msgstr "Išdėstyti pa&kopomis\tVald+F5" #: winefile.rc:122 msgid "Tile &Vertically\tCtrl+F4" -msgstr "Iškloti &stačiai\tCtrl+F4" +msgstr "Iškloti &stačiai\tVald+F4" #: winefile.rc:124 msgid "Arrange Automatically" @@ -8235,11 +8195,11 @@ msgstr "Žinyno temos: " #: wordpad.rc:28 msgid "&New...\tCtrl+N" -msgstr "&Naujas...\tCtrl+N" +msgstr "&Naujas...\tVald+N" #: wordpad.rc:42 msgid "R&edo\tCtrl+Y" -msgstr "&Grąžinti\tCtrl+Y" +msgstr "&Grąžinti\tVald+Y" #: wordpad.rc:47 msgid "&Clear\tDEL" @@ -8247,11 +8207,11 @@ msgstr "&Šalinti\tDEL" #: wordpad.rc:48 msgid "&Select all\tCtrl+A" -msgstr "&Pažymėti viską\tCtrl+A" +msgstr "&Pažymėti viską\tVald+A" #: wordpad.rc:50 msgid "&Find...\tCtrl+F" -msgstr "I&eškoti...\tCtrl+F" +msgstr "I&eškoti...\tVald+F" #: wordpad.rc:51 msgid "Find &next\tF3" @@ -8335,11 +8295,11 @@ msgstr "&Fonas" #: wordpad.rc:87 msgid "&System\tCtrl+1" -msgstr "&Sistemos\tCtrl+1" +msgstr "&Sistemos\tVald+1" #: wordpad.rc:88 msgid "&PostThat yellowish\tCtrl+2" -msgstr "&Gelsvas\tCtrl+2" +msgstr "&Gelsvas\tVald+2" #: wordpad.rc:93 msgid "&About Wine Wordpad"

1 0

Alexandre Julliard : po: Unify the spelling of some menu entries across programs.
by Alexandre Julliard Jan. 14, 2011

Jan. 14, 2011

Module: wine Branch: master Commit: baeb0d971f1a2bb52e493778491d6bdfe334990a URL: http://source.winehq.org/git/wine.git/?a=commit;h=baeb0d971f1a2bb52e4937784… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 14 17:56:12 2011 +0100 po: Unify the spelling of some menu entries across programs. --- po/ar.po | 38 ++++++++------------------------------ po/bg.po | 37 ++++++++----------------------------- po/ca.po | 35 ++++++++--------------------------- po/cs.po | 34 +++++++--------------------------- po/da.po | 32 +++++++------------------------- po/de.po | 32 +++++++------------------------- po/el.po | 31 ++++++------------------------- po/en.po | 37 ++++++++----------------------------- po/en_US.po | 32 +++++++------------------------- po/eo.po | 38 ++++++++------------------------------ po/es.po | 34 +++++++--------------------------- po/fa.po | 38 ++++++++------------------------------ po/fi.po | 38 ++++++++------------------------------ po/fr.po | 32 +++++++------------------------- po/he.po | 32 +++++++------------------------- po/hi.po | 32 ++++++-------------------------- po/hu.po | 33 +++++++-------------------------- po/it.po | 32 +++++++------------------------- po/ja.po | 34 +++++++--------------------------- po/ko.po | 32 +++++++------------------------- po/lt.po | 32 +++++++------------------------- po/ml.po | 32 ++++++-------------------------- po/nb_NO.po | 32 +++++++------------------------- po/nl.po | 32 +++++++------------------------- po/or.po | 32 ++++++-------------------------- po/pa.po | 32 ++++++-------------------------- po/pl.po | 32 +++++++------------------------- po/pt_BR.po | 32 +++++++------------------------- po/pt_PT.po | 32 +++++++------------------------- po/rm.po | 34 ++++++---------------------------- po/ro.po | 32 +++++++------------------------- po/ru.po | 32 +++++++------------------------- po/sk.po | 33 ++++++--------------------------- po/sl.po | 32 +++++++------------------------- po/sr_RS(a)cyrillic.po | 39 ++++++++------------------------------- po/sr_RS(a)latin.po | 38 ++++++++------------------------------ po/sv.po | 32 +++++++------------------------- po/te.po | 32 ++++++-------------------------- po/th.po | 39 ++++++++------------------------------- po/tr.po | 32 +++++++------------------------- po/uk.po | 33 +++++++-------------------------- po/wa.po | 38 ++++++++------------------------------ po/wine.pot | 31 ++++++------------------------- po/zh_CN.po | 32 +++++++------------------------- po/zh_TW.po | 32 +++++++------------------------- programs/progman/progman.rc | 4 ++-- programs/taskmgr/taskmgr.rc | 4 ++-- programs/winefile/winefile.rc | 2 +- programs/winhlp32/winhlp32.rc | 2 +- programs/wordpad/wordpad.rc | 2 +- 50 files changed, 324 insertions(+), 1202 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=baeb0d971f1a2bb52e493…

1 0

Jörg Höhle : winmm: PlaySound ignores SND_NOWAIT.
by Alexandre Julliard Jan. 14, 2011

Jan. 14, 2011

Module: wine Branch: master Commit: 0a81f12ce10f88a06e1a95523c1e4da7587fa3e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a81f12ce10f88a06e1a95523… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jan 11 23:30:34 2011 +0100 winmm: PlaySound ignores SND_NOWAIT. --- dlls/winmm/playsound.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 7b6c946..f6416ed 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -472,10 +472,8 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo TRACE("pszSound='%p' hmod=%p fdwSound=%08X\n", pszSound, hmod, fdwSound); - /* FIXME? I see no difference between SND_NOWAIT and SND_NOSTOP ! - * there could be one if several sounds can be played at once... - */ - if ((fdwSound & (SND_NOWAIT | SND_NOSTOP)) && PlaySoundList != NULL) + /* SND_NOWAIT is ignored in w95/2k/xp. */ + if ((fdwSound & SND_NOSTOP) && PlaySoundList != NULL) return FALSE; /* alloc internal structure, if we need to play something */

1 0

Jacek Caban : msxml3: Fixed memory leak (valgrind).
by Alexandre Julliard Jan. 14, 2011

Jan. 14, 2011

Module: wine Branch: master Commit: 4c6f8989eb27165c1ae90cd01b6ec65e65a027e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6f8989eb27165c1ae90cd01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 14 14:01:57 2011 +0100 msxml3: Fixed memory leak (valgrind). --- dlls/msxml3/httprequest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 23bc227..4dd4de8 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -543,6 +543,7 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) list_remove(&header->entry); SysFreeString(header->header); SysFreeString(header->value); + heap_free(header); } /* detach callback object */

1 0

Greg Geldorp : ddraw/tests: Remove some outdated tests.
by Alexandre Julliard Jan. 14, 2011

Jan. 14, 2011

Module: wine Branch: master Commit: 1e7c80ba9afb8b442ff2148cd364c149f107cbb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7c80ba9afb8b442ff2148cd… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Fri Jan 14 15:02:34 2011 +0100 ddraw/tests: Remove some outdated tests. --- dlls/ddraw/tests/d3d.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index a8535a3..1b312b5 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -766,16 +766,7 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS } else if(IsEqualGUID(&IID_IDirect3DHALDevice, Guid)) { - /* pow2 is hardware dependent */ - - ok(hal->dpcLineCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, - "HAL Device %d hal line caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); - ok(hal->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, - "HAL Device %d hal tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); - ok((hel->dpcLineCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE) == 0, - "HAL Device %d hel line caps has D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); - ok((hel->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE) == 0, - "HAL Device %d hel tri caps has D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); + trace("HAL Device %d\n", ver); } else if(IsEqualGUID(&IID_IDirect3DRefDevice, Guid)) { @@ -3622,7 +3613,8 @@ static void FindDevice(void) /* Currently Wine only supports the creation of one Direct3D device * for a given DirectDraw instance. */ todo_wine - ok(SUCCEEDED(hr), "Expected IDirectDrawSurface::QueryInterface to succeed, got 0x%08x\n", hr); + ok(SUCCEEDED(hr) || broken(hr == DDERR_INVALIDPIXELFORMAT) /* XP/Win2003 Wow64 on VMware */, + "Expected IDirectDrawSurface::QueryInterface to succeed, got 0x%08x\n", hr); if (SUCCEEDED(hr)) IDirect3DDevice_Release(d3dhal);

1 0

Juan Lang : mswsock.h: Fix typo.
by Alexandre Julliard Jan. 14, 2011

Jan. 14, 2011

Module: wine Branch: master Commit: 7d21d9361ca99d2870cf73f49bfe8847a89e5baa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d21d9361ca99d2870cf73f49… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 14 07:59:17 2011 -0800 mswsock.h: Fix typo. --- include/mswsock.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 1447a8d..610dd2c 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -87,7 +87,7 @@ extern "C" { #define SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR,300) #else #define WS_SIO_UDP_CONNRESET _WSAIOW(WS_IOC_VENDOR,12) -#define WS_SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR,300) +#define WS_SIO_SET_COMPATIBILITY_MODE _WSAIOW(WS_IOC_VENDOR,300) #endif #define DE_REUSE_SOCKET TF_REUSE_SOCKET

1 0

Alexander Kochetkov : wineps.drv: Disable world transform for fonts in GM_COMPATIBLE mode.
by Alexandre Julliard Jan. 14, 2011

Jan. 14, 2011

Module: wine Branch: master Commit: 69f88da1879cc850113e5f55d0cb85fd13ea2701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f88da1879cc850113e5f55d… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Fri Jan 14 03:18:19 2011 +0300 wineps.drv: Disable world transform for fonts in GM_COMPATIBLE mode. --- dlls/wineps.drv/download.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 9ad8a2c..52de752 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -20,6 +20,7 @@ #include <string.h> #include <stdlib.h> #include <assert.h> +#include <math.h> #include <stdarg.h> #include <stdio.h> @@ -271,6 +272,12 @@ BOOL PSDRV_WriteSetDownloadFont(PSDRV_PDEVICE *physDev) /* Retrieve the world -> device transform */ GetTransform(physDev->hdc, 0x204, &xform); + if(GetGraphicsMode(physDev->hdc) == GM_COMPATIBLE) + { + xform.eM11 = xform.eM22 = fabs(xform.eM22); + xform.eM21 = xform.eM12 = 0; + } + physDev->font.size.xx = ps_round(ppem * xform.eM11); physDev->font.size.xy = ps_round(ppem * xform.eM12); physDev->font.size.yx = ps_round(ppem * xform.eM21);

1 0

Erich Hoover : urlmon: Fix MK protocol handling of escaped characters.
by Alexandre Julliard Jan. 14, 2011

Jan. 14, 2011

Module: wine Branch: master Commit: aaa9fa711260da7272dc7d2330e6c366fac04904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa9fa711260da7272dc7d233… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Jan 11 12:04:25 2011 -0700 urlmon: Fix MK protocol handling of escaped characters. --- dlls/urlmon/mk.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index bfee8e9..46b4ddc 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -205,8 +205,8 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, LPWSTR mime, progid, display_name, colon_ptr; DWORD path_size = INTERNET_MAX_URL_LENGTH; DWORD bindf=0, eaten=0, scheme=0, len; + BSTR url, path_tmp, path = NULL; IParseDisplayName *pdn; - BSTR url, path = NULL; BINDINFO bindinfo; STATSTG statstg; IMoniker *mon; @@ -244,14 +244,22 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, CoTaskMemFree(mime); } - hres = IUri_GetPath(pUri, &path); + hres = IUri_GetPath(pUri, &path_tmp); if(FAILED(hres)) return hres; + path = heap_alloc(path_size); + hres = UrlUnescapeW((LPWSTR)path_tmp, path, &path_size, 0); + SysFreeString(path_tmp); + if (FAILED(hres)) + { + heap_free(path); + return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); + } progid = path+1; /* skip '@' symbol */ colon_ptr = strchrW(path, ':'); if(!colon_ptr) { - SysFreeString(path); + heap_free(path); return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); } @@ -261,7 +269,7 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, progid[colon_ptr-progid] = 0; /* overwrite ':' with NULL terminator */ hres = CLSIDFromProgID(progid, &clsid); - SysFreeString(path); + heap_free(path); if(FAILED(hres)) { heap_free(display_name);

1 0

Erich Hoover : urlmon: Update MK protocol handling to IInternetProtocolEx.
by Alexandre Julliard Jan. 14, 2011

Jan. 14, 2011

Module: wine Branch: master Commit: 1678a4a673b8dde13754eddf51a08d98f086ba01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1678a4a673b8dde13754eddf5… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Jan 11 12:03:38 2011 -0700 urlmon: Update MK protocol handling to IInternetProtocolEx. --- dlls/urlmon/mk.c | 275 +++++++++++++++++++++++++++++++----------------------- 1 files changed, 159 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1678a4a673b8dde13754e…

1 0

Michael Stefaniuc : objsel: COM cleanup for the IDsObjectPicker iface.
by Alexandre Julliard Jan. 14, 2011

Jan. 14, 2011

Module: wine Branch: master Commit: f0bd3e694b60f662a473aeda4788415c1d6241f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0bd3e694b60f662a473aeda4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 14 00:46:40 2011 +0100 objsel: COM cleanup for the IDsObjectPicker iface. --- dlls/objsel/objsel.c | 15 ++++++++++----- dlls/objsel/objsel_private.h | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c index 3ba2ac1..f258e1d 100644 --- a/dlls/objsel/objsel.c +++ b/dlls/objsel/objsel.c @@ -99,12 +99,17 @@ static VOID OBJSEL_IDsObjectPicker_Destroy(IDsObjectPickerImpl *This) } +static inline IDsObjectPickerImpl *impl_from_IDsObjectPicker(IDsObjectPicker *iface) +{ + return CONTAINING_RECORD(iface, IDsObjectPickerImpl, IDsObjectPicker_iface); +} + /********************************************************************** * OBJSEL_IDsObjectPicker_AddRef (also IUnknown) */ static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker * iface) { - IDsObjectPickerImpl *This = (IDsObjectPickerImpl *)iface; + IDsObjectPickerImpl *This = impl_from_IDsObjectPicker(iface); ULONG ref; TRACE("\n"); @@ -127,7 +132,7 @@ static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker * iface) */ static ULONG WINAPI OBJSEL_IDsObjectPicker_Release(IDsObjectPicker * iface) { - IDsObjectPickerImpl *This = (IDsObjectPickerImpl *)iface; + IDsObjectPickerImpl *This = impl_from_IDsObjectPicker(iface); ULONG ref; TRACE("\n"); @@ -219,9 +224,9 @@ HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj) sizeof(IDsObjectPickerImpl)); if (Instance != NULL) { - Instance->lpVtbl = &IDsObjectPicker_Vtbl; - OBJSEL_IDsObjectPicker_AddRef((IDsObjectPicker *)Instance); - + Instance->IDsObjectPicker_iface.lpVtbl = &IDsObjectPicker_Vtbl; + OBJSEL_IDsObjectPicker_AddRef(&Instance->IDsObjectPicker_iface); + *ppvObj = Instance; return S_OK; } diff --git a/dlls/objsel/objsel_private.h b/dlls/objsel/objsel_private.h index 62d6eb4..13ab577 100644 --- a/dlls/objsel/objsel_private.h +++ b/dlls/objsel/objsel_private.h @@ -55,7 +55,7 @@ typedef struct typedef struct { - IDsObjectPickerVtbl *lpVtbl; + IDsObjectPicker IDsObjectPicker_iface; LONG ref; } IDsObjectPickerImpl;

1 0