December 2011 - Wine-commits

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_VERTEXSTATS.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: 529286bdcdbe5f858360c6778901a9600267b294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529286bdcdbe5f858360c6778… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 4 15:50:15 2011 +0100 wined3d: Get rid of WINED3DDEVINFO_VERTEXSTATS. --- include/wine/wined3d.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1a0d170..2704152 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1702,12 +1702,6 @@ struct wined3d_raster_status UINT scan_line; }; -typedef struct _WINED3DDEVINFO_VERTEXSTATS -{ - DWORD NumRenderedTriangles; - DWORD NumExtraClippingTriangles; -} WINED3DDEVINFO_VERTEXSTATS; - typedef struct _WINED3DLOCKED_RECT { INT Pitch;

1 0

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_VCACHE.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: 6a6e11084914e5ad7d3128e74cb1c8af9c4533c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6e11084914e5ad7d3128e74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 4 15:50:16 2011 +0100 wined3d: Get rid of WINED3DDEVINFO_VCACHE. --- include/wine/wined3d.h | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2704152..f4f9578 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1725,16 +1725,6 @@ typedef struct _WINED3DBOX UINT Back; } WINED3DBOX; -/*Vertex cache optimization hints.*/ -typedef struct WINED3DDEVINFO_VCACHE -{ - DWORD Pattern; /* Must be a 4 char code FOURCC (e.g. CACH) */ - DWORD OptMethod; /* 0 to get the longest strips, 1 vertex cache */ - DWORD CacheSize; /* Cache size to use (only valid if OptMethod==1) */ - DWORD MagicNumber; /* Internal for deciding when to restart strips, - non user modifiable (only valid if OptMethod==1) */ -} WINED3DDEVINFO_VCACHE; - typedef struct WineDirect3DStridedData { enum wined3d_format_id format; /* Format of the data */

1 0

Nikolay Sivov : comctl32/listview: Create header when LVS_EX_GRIDLINES style is set.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: dfbe664548294cf76ca401b89dbf5cd6bbfe0308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfbe664548294cf76ca401b89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 4 21:18:57 2011 +0300 comctl32/listview: Create header when LVS_EX_GRIDLINES style is set. --- dlls/comctl32/listview.c | 39 +++++++++++++++++++++------------------ dlls/comctl32/tests/listview.c | 14 ++++++++++++++ 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b0c4646..c951633 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8392,17 +8392,19 @@ static HIMAGELIST LISTVIEW_CreateCheckBoxIL(const LISTVIEW_INFO *infoPtr) * SUCCESS : previous style * FAILURE : 0 */ -static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwMask, DWORD dwExStyle) +static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD mask, DWORD ex_style) { - DWORD dwOldExStyle = infoPtr->dwLvExStyle; + DWORD old_ex_style = infoPtr->dwLvExStyle; + + TRACE("mask=0x%08x, ex_style=0x%08x\n", mask, ex_style); /* set new style */ - if (dwMask) - infoPtr->dwLvExStyle = (dwOldExStyle & ~dwMask) | (dwExStyle & dwMask); + if (mask) + infoPtr->dwLvExStyle = (old_ex_style & ~mask) | (ex_style & mask); else - infoPtr->dwLvExStyle = dwExStyle; + infoPtr->dwLvExStyle = ex_style; - if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_CHECKBOXES) + if((infoPtr->dwLvExStyle ^ old_ex_style) & LVS_EX_CHECKBOXES) { HIMAGELIST himl = 0; if(infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) @@ -8422,38 +8424,39 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM if(((infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) && !(infoPtr->dwStyle & LVS_SHAREIMAGELISTS)) || /* ...previous was checkbox list */ - (dwOldExStyle & LVS_EX_CHECKBOXES)) + (old_ex_style & LVS_EX_CHECKBOXES)) ImageList_Destroy(himl); } - if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_HEADERDRAGDROP) + if((infoPtr->dwLvExStyle ^ old_ex_style) & LVS_EX_HEADERDRAGDROP) { - DWORD dwStyle; + DWORD style; /* if not already created */ LISTVIEW_CreateHeader(infoPtr); - dwStyle = GetWindowLongW(infoPtr->hwndHeader, GWL_STYLE); + style = GetWindowLongW(infoPtr->hwndHeader, GWL_STYLE); if (infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) - dwStyle |= HDS_DRAGDROP; + style |= HDS_DRAGDROP; else - dwStyle &= ~HDS_DRAGDROP; - SetWindowLongW(infoPtr->hwndHeader, GWL_STYLE, dwStyle); + style &= ~HDS_DRAGDROP; + SetWindowLongW(infoPtr->hwndHeader, GWL_STYLE, style); } /* GRIDLINES adds decoration at top so changes sizes */ - if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_GRIDLINES) + if((infoPtr->dwLvExStyle ^ old_ex_style) & LVS_EX_GRIDLINES) { + LISTVIEW_CreateHeader(infoPtr); LISTVIEW_UpdateSize(infoPtr); } - if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_TRANSPARENTBKGND) + if((infoPtr->dwLvExStyle ^ old_ex_style) & LVS_EX_TRANSPARENTBKGND) { if (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTBKGND) LISTVIEW_SetBkColor(infoPtr, CLR_NONE); } - if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_HEADERINALLVIEWS) + if((infoPtr->dwLvExStyle ^ old_ex_style) & LVS_EX_HEADERINALLVIEWS) { if (infoPtr->dwLvExStyle & LVS_EX_HEADERINALLVIEWS) LISTVIEW_CreateHeader(infoPtr); @@ -8464,7 +8467,7 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM } LISTVIEW_InvalidateList(infoPtr); - return dwOldExStyle; + return old_ex_style; } /*** @@ -9369,7 +9372,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) { LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0); - TRACE("(lpcs=%p)\n", lpcs); + TRACE("(lpcs=%p, style=0x%08x)\n", lpcs, lpcs->style); infoPtr->dwStyle = lpcs->style; map_style_view(infoPtr); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 344df1d..64d6090 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1543,6 +1543,20 @@ static void test_create(void) ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); + /* setting LVS_EX_GRIDLINES creates header */ + hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_GRIDLINES); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader) || + broken(!IsWindow(hHeader)), /* 4.7x common controls */ + "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + DestroyWindow(hList); + /* not report style accepts LVS_EX_HEADERDRAGDROP too */ hList = create_listview_control(LVS_ICON); SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_HEADERDRAGDROP);

1 0

Andrew Eikum : dsound: Validate format in primary buffer's SetFormat().
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: 287a6e8473cb40396b00556ced4f9b275f54ff8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=287a6e8473cb40396b00556ce… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 2 11:53:14 2011 -0600 dsound: Validate format in primary buffer's SetFormat(). --- dlls/dsound/primary.c | 6 ++ dlls/dsound/tests/dsound.c | 139 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 3b61562..1cc59e5 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -374,6 +374,12 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe passed_fmt->nAvgBytesPerSec, passed_fmt->nBlockAlign, passed_fmt->wBitsPerSample, passed_fmt->cbSize); + if(passed_fmt->wBitsPerSample < 8 || passed_fmt->wBitsPerSample % 8 != 0 || + passed_fmt->nChannels == 0 || passed_fmt->nSamplesPerSec == 0 || + passed_fmt->nAvgBytesPerSec == 0 || + passed_fmt->nBlockAlign != passed_fmt->nChannels * passed_fmt->wBitsPerSample / 8) + return DSERR_INVALIDPARAM; + /* **** */ RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); EnterCriticalSection(&(device->mixlock)); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0c0239c..45dd00a 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1221,6 +1221,144 @@ EXIT: return rc; } +static HRESULT test_invalid_fmts(LPGUID lpGuid) +{ + HRESULT rc; + LPDIRECTSOUND dso=NULL; + LPDIRECTSOUNDBUFFER primary=NULL; + DSBUFFERDESC bufdesc; + + /* Create the DirectSound object */ + rc=pDirectSoundCreate(lpGuid,&dso,NULL); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate() failed: %08x\n",rc); + if (rc!=DS_OK) + return rc; + + /* We must call SetCooperativeLevel before creating primary buffer */ + /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ + rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + if (rc!=DS_OK){ + IDirectSound_Release(dso); + return rc; + } + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize=sizeof(bufdesc); + bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; + rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); + ok(rc==DS_OK && primary!=NULL,"IDirectSound_CreateSoundBuffer() failed " + "to create a primary buffer %08x\n",rc); + + if (rc==DS_OK && primary!=NULL) { + WAVEFORMATEX wfx; + + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.nChannels = 0; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = IDirectSoundBuffer_SetFormat(primary, &wfx); + ok(rc == E_INVALIDARG, "SetFormat: %08x\n", rc); + + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 0; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = IDirectSoundBuffer_SetFormat(primary, &wfx); + ok(rc == E_INVALIDARG, "SetFormat: %08x\n", rc); + + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 2; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = IDirectSoundBuffer_SetFormat(primary, &wfx); + ok(rc == E_INVALIDARG, "SetFormat: %08x\n", rc); + + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 12; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = IDirectSoundBuffer_SetFormat(primary, &wfx); + ok(rc == E_INVALIDARG, "SetFormat: %08x\n", rc); + + wfx.nChannels = 2; + wfx.nSamplesPerSec = 0; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = IDirectSoundBuffer_SetFormat(primary, &wfx); + ok(rc == E_INVALIDARG, "SetFormat: %08x\n", rc); + + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = 0; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = IDirectSoundBuffer_SetFormat(primary, &wfx); + ok(rc == E_INVALIDARG, "SetFormat: %08x\n", rc); + + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = 0; + rc = IDirectSoundBuffer_SetFormat(primary, &wfx); + ok(rc == E_INVALIDARG, "SetFormat: %08x\n", rc); + + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = (wfx.nChannels * wfx.wBitsPerSample / 8) - 1; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = IDirectSoundBuffer_SetFormat(primary, &wfx); + ok(rc == E_INVALIDARG, "SetFormat: %08x\n", rc); + + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = (wfx.nChannels * wfx.wBitsPerSample / 8) + 1; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = IDirectSoundBuffer_SetFormat(primary, &wfx); + ok(rc == E_INVALIDARG, "SetFormat: %08x\n", rc); + + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign + 1; + rc = IDirectSoundBuffer_SetFormat(primary, &wfx); + ok(rc == S_OK, "SetFormat: %08x\n", rc); + + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign - 1; + rc = IDirectSoundBuffer_SetFormat(primary, &wfx); + ok(rc == S_OK, "SetFormat: %08x\n", rc); + + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign + 1; + rc = IDirectSoundBuffer_SetFormat(primary, &wfx); + ok(rc == S_OK, "SetFormat: %08x\n", rc); + + IDirectSoundBuffer_Release(primary); + } + + IDirectSound_Release(dso); + + return S_OK; +} + static unsigned int number; static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, @@ -1250,6 +1388,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, test_secondary(lpGuid); test_frequency(lpGuid); test_duplicate(lpGuid); + test_invalid_fmts(lpGuid); } return 1;

1 0

Alexandre Julliard : Wine release 1.3.34
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: website Branch: master Commit: 18c1900e5330d5ee810636a745a5c78a394b1931 URL: http://source.winehq.org/git/website.git/?a=commit;h=18c1900e5330d5ee810636… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 2 20:31:33 2011 +0100 Wine release 1.3.34 --- news/en/2011120201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2011120201.xml b/news/en/2011120201.xml new file mode 100644 index 0000000..7d76ac5 --- /dev/null +++ b/news/en/2011120201.xml @@ -0,0 +1,17 @@ +<news> +<date>December 2, 2011</date> +<title>Wine 1.3.34 Released</title> +<body> + The Wine development release 1.3.34 is now available. + <a href="{$root}/announce/1.3.34">What's new</a> in this release: +<ul> + <li>Bytecode support in JavaScript.</li> + <li>Support for gradients in the DIB engine.</li> + <li>A number of Uniscribe improvements.</li> + <li>Fixes for DirectDraw mode switching.</li> + <li>A few more MSVC runtime functions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.34.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: 4ead384dd7226099ce1a1a2cd0be07743bcceaad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ead384dd7226099ce1a1a2cd… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Dec 2 19:06:48 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/po/lt.po b/po/lt.po index 0d5ef9d..7efa8f2 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-11-26 17:27+0300\n" +"PO-Revision-Date: 2011-12-02 19:05+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -114,7 +114,6 @@ msgid "Wine Gecko Installer" msgstr "Wine Gecko diegimo programa" #: appwiz.rc:100 -#, fuzzy msgid "" "Wine could not find a Gecko package which is needed for applications " "embedding HTML to work correctly. Wine can automatically download and " @@ -124,11 +123,11 @@ msgid "" "href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"Wine nepavyko rasti Gecko paketo reikalingo programoms įterpiančioms HTML " +"Wine nepavyko rasti Gecko paketo reikalingo programoms, įterpiančioms HTML, " "teisingai veikti. Wine gali automatiškai atsiųsti ir įdiegti šį paketą.\n" "\n" "Pastaba: rekomenduojama naudoti distribucijos paketus. Daugiau informacijos " -"http://wiki.winehq.org/Gecko." +"<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a>." #: appwiz.rc:106 msgid "&Install" @@ -6018,9 +6017,8 @@ msgid "&Data Rate" msgstr "&Duomenų sparta" #: msvfw32.rc:52 -#, fuzzy msgid "kB/sec" -msgstr "KB/sek" +msgstr "kB/s" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)" @@ -6501,9 +6499,8 @@ msgid "us" msgstr "µs" #: serialui.rc:25 -#, fuzzy msgid "Settings for %s" -msgstr "%s savybės" +msgstr "%s nustatymai" #: serialui.rc:28 msgid "Baud Rate" @@ -12519,7 +12516,6 @@ msgstr "" "dėl nepatogumų." #: winedbg.rc:53 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -12529,11 +12525,11 @@ msgid "" "you can <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a>." msgstr "" "Programos problemos ar Wine trūkumai gali būti to priežastimi. Jūs turbūt " -"norėsite patikrinti http://appdb.winehq.org dėl patarimų apie šios programos " -"vykdymą.\n" +"norėsite patikrinti <a href=\"http://appdb.winehq.org\">programų duomenų " +"bazę</a> dėl patarimų apie šios programos vykdymą.\n" "\n" "Jei šios problemos nėra Windows sistemoje ir apie ją dar nebuvo pranešta, " -"galite pranešti http://bugs.winehq.org." +"galite <a href=\"http://wiki.winehq.org/Bugs\">užregistruoti klaidą</a>." #: winedbg.rc:35 msgid "Wine program crash"

1 0

Alexandre Julliard : Release 1.3.34.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: 3f5159dd06d3342ef42e58a55ec5a3d54ec0cfdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5159dd06d3342ef42e58a55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 2 20:20:07 2011 +0100 Release 1.3.34. --- ANNOUNCE | 1052 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 507 insertions(+), 565 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f5159dd06d3342ef42e5…

1 0

Tag wine-1.3.34 : Alexandre Julliard : Release 1.3.34
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: refs/tags/wine-1.3.34 Tag: a77dbbf07a13387d429bc3a00c176830a1a1028c URL: http://source.winehq.org/git/wine.git/?a=tag;h=a77dbbf07a13387d429bc3a00c17… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 2 20:20:09 2011 +0100 Release 1.3.34

1 0

Huw Davies : gdi32: Add support for checking the font's gasp flags.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: 4ce3af3fad1dfacfe39a441054586707f848038f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce3af3fad1dfacfe39a44105… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 2 14:11:51 2011 +0000 gdi32: Add support for checking the font's gasp flags. --- dlls/gdi32/font.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5b7d500..a785283 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -32,11 +32,18 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "winternl.h" #include "gdi_private.h" #include "wine/exception.h" #include "wine/unicode.h" #include "wine/debug.h" +#ifdef WORDS_BIGENDIAN +#define get_be_word(x) (x) +#else +#define get_be_word(x) RtlUshortByteSwap(x) +#endif + WINE_DEFAULT_DEBUG_CHANNEL(font); /* Device -> World size conversion */ @@ -258,10 +265,73 @@ static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRIC memcpy(&ptmA->ntmFontSig, &ptmW->ntmFontSig, sizeof(FONTSIGNATURE)); } +static DWORD get_font_ppem( HDC hdc ) +{ + TEXTMETRICW tm; + DWORD ppem; + DC *dc = get_dc_ptr( hdc ); + + if (!dc) return GDI_ERROR; + + GetTextMetricsW( hdc, &tm ); + ppem = abs( INTERNAL_YWSTODS( dc, tm.tmAscent + tm.tmDescent - tm.tmInternalLeading ) ); + release_dc_ptr( dc ); + return ppem; +} + +#define GASP_GRIDFIT 0x01 +#define GASP_DOGRAY 0x02 + +static BOOL get_gasp_flags( HDC hdc, WORD *flags ) +{ + DWORD size, gasp_tag = 0x70736167; + WORD buf[16]; /* Enough for seven ranges before we need to alloc */ + WORD *alloced = NULL, *ptr = buf; + WORD num_recs, version; + DWORD ppem = get_font_ppem( hdc ); + BOOL ret = FALSE; + + *flags = 0; + if (ppem == GDI_ERROR) return FALSE; + + size = GetFontData( hdc, gasp_tag, 0, NULL, 0 ); + if (size == GDI_ERROR) return FALSE; + if (size < 4 * sizeof(WORD)) return FALSE; + if (size > sizeof(buf)) + { + ptr = alloced = HeapAlloc( GetProcessHeap(), 0, size ); + if (!ptr) return FALSE; + } + + GetFontData( hdc, gasp_tag, 0, ptr, size ); + + version = get_be_word( *ptr++ ); + num_recs = get_be_word( *ptr++ ); + + if (version > 1 || size < (num_recs * 2 + 2) * sizeof(WORD)) + { + FIXME( "Unsupported gasp table: ver %d size %d recs %d\n", version, size, num_recs ); + goto done; + } + + while (num_recs--) + { + *flags = get_be_word( *(ptr + 1) ); + if (ppem <= get_be_word( *ptr )) break; + ptr += 2; + } + TRACE( "got flags %04x for ppem %d\n", *flags, ppem ); + ret = TRUE; + +done: + HeapFree( GetProcessHeap(), 0, alloced ); + return ret; +} UINT get_font_aa_flags( HDC hdc ) { LOGFONTW lf; + WORD gasp_flags; if (GetObjectType( hdc ) == OBJ_MEMDC) { @@ -274,7 +344,10 @@ UINT get_font_aa_flags( HDC hdc ) GetObjectW( GetCurrentObject( hdc, OBJ_FONT ), sizeof(lf), &lf ); if (lf.lfQuality == NONANTIALIASED_QUALITY) return GGO_BITMAP; - /* FIXME, check gasp and user prefs */ + if (get_gasp_flags( hdc, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) + return GGO_BITMAP; + + /* FIXME, check user prefs */ return GGO_GRAY4_BITMAP; }

1 0

Francois Gouget : libwine: Include a couple of extra system headers to fix the compilation on Solaris .
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: e4387430410c81cf339923b6d041a2e9b076293d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4387430410c81cf339923b6d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 2 15:27:33 2011 +0100 libwine: Include a couple of extra system headers to fix the compilation on Solaris. --- libs/wine/mmap.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 1529a85..6ec814a 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -23,11 +23,15 @@ #include <assert.h> #include <ctype.h> +#include <errno.h> #include <fcntl.h> #include <stdlib.h> #include <stdio.h> #include <string.h> #include <sys/types.h> +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif

1 0