December 2011 - Wine-Commits

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_VERTEXSTATS.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

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 Dec. 5, 2011

Dec. 5, 2011

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

André Hentschel : winecfg: Bump NT 3. 51 to Service Pack 5.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 2503f2e1bb13bb0ae73bb5fef595a7c5923122b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2503f2e1bb13bb0ae73bb5fef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 2 17:58:28 2011 +0100 winecfg: Bump NT 3.51 to Service Pack 5. --- dlls/ntdll/version.c | 4 ++-- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index c8c616d..0185d7f 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -112,8 +112,8 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = /* NT351 */ { sizeof(RTL_OSVERSIONINFOEXW), 3, 51, 0x421, VER_PLATFORM_WIN32_NT, - {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','2',0}, - 0, 0, 0, 0, 0 + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','5',0}, + 5, 0, 0, VER_NT_WORKSTATION, 0 }, /* NT40 */ { diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index e979713..bee2ae5 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -60,7 +60,7 @@ static const struct { "win98", "Windows 98", 4, 10, 0x8AE, VER_PLATFORM_WIN32_WINDOWS, " A ", 0, 0, ""}, { "win95", "Windows 95", 4, 0, 0x3B6, VER_PLATFORM_WIN32_WINDOWS, "", 0, 0, ""}, { "nt40", "Windows NT 4.0", 4, 0, 0x565, VER_PLATFORM_WIN32_NT, "Service Pack 6a", 6, 0, "WinNT"}, - { "nt351", "Windows NT 3.5", 3, 51, 0x421, VER_PLATFORM_WIN32_NT, "Service Pack 2", 0, 0, "WinNT"}, + { "nt351", "Windows NT 3.51", 3, 51, 0x421, VER_PLATFORM_WIN32_NT, "Service Pack 5", 5, 0, "WinNT"}, { "win31", "Windows 3.1", 3, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win30", "Windows 3.0", 3, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win20", "Windows 2.0", 2, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}

1 0

Henri Verbeet : wined3d: Create the device state block when the device is created.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: df446ae4fe51f6c38622accc20e97e80ea7a885f URL: http://source.winehq.org/git/wine.git/?a=commit;h=df446ae4fe51f6c38622accc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 4 15:50:12 2011 +0100 wined3d: Create the device state block when the device is created. --- dlls/wined3d/device.c | 61 +++++++++++++++++++++--------------------------- 1 files changed, 27 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1226390..e96e3c4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -843,8 +843,19 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) if (!refcount) { + struct wined3d_stateblock *stateblock; UINT i; + if (wined3d_stateblock_decref(device->updateStateBlock) + && device->updateStateBlock != device->stateBlock) + FIXME("Something's still holding the update stateblock.\n"); + device->updateStateBlock = NULL; + + stateblock = device->stateBlock; + device->stateBlock = NULL; + if (wined3d_stateblock_decref(stateblock)) + FIXME("Something's still holding the stateblock.\n"); + for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) { HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); @@ -1214,18 +1225,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (!device->adapter->opengl) return WINED3DERR_INVALIDCALL; - TRACE("Creating stateblock.\n"); - hr = wined3d_stateblock_create(device, WINED3DSBT_INIT, &device->stateBlock); - if (FAILED(hr)) - { - WARN("Failed to create stateblock\n"); - goto err_out; - } - - TRACE("Created stateblock %p.\n", device->stateBlock); - device->updateStateBlock = device->stateBlock; - wined3d_stateblock_incref(device->updateStateBlock); - device->valid_rt_mask = 0; for (i = 0; i < gl_info->limits.buffers; ++i) device->valid_rt_mask |= (1 << i); @@ -1360,11 +1359,6 @@ err_out: device->swapchain_count = 0; if (swapchain) wined3d_swapchain_decref(swapchain); - if (device->stateBlock) - { - wined3d_stateblock_decref(device->stateBlock); - device->stateBlock = NULL; - } if (device->blit_priv) device->blitter->free_private(device); if (device->fragment_priv) @@ -1472,23 +1466,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) device->depth_blt_texture = 0; } - /* Release the update stateblock */ - if (wined3d_stateblock_decref(device->updateStateBlock)) - { - if (device->updateStateBlock != device->stateBlock) - FIXME("Something's still holding the update stateblock.\n"); - } - device->updateStateBlock = NULL; - - { - struct wined3d_stateblock *stateblock = device->stateBlock; - device->stateBlock = NULL; - - /* Release the stateblock */ - if (wined3d_stateblock_decref(stateblock)) - FIXME("Something's still holding the stateblock.\n"); - } - /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ device->blitter->free_private(device); device->frag_pipe->free_private(device); @@ -5980,6 +5957,22 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, } device->blitter = adapter->blitter; + hr = wined3d_stateblock_create(device, WINED3DSBT_INIT, &device->stateBlock); + if (FAILED(hr)) + { + WARN("Failed to create stateblock.\n"); + for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) + { + HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); + } + wined3d_decref(device->wined3d); + return hr; + } + + TRACE("Created stateblock %p.\n", device->stateBlock); + device->updateStateBlock = device->stateBlock; + wined3d_stateblock_incref(device->updateStateBlock); + return WINED3D_OK; }

1 0

Alexandre Julliard : Wine release 1.3.34
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

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

Tag wine-1.3.34 : Alexandre Julliard : Release 1.3.34
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

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

Alexandre Julliard : Release 1.3.34.
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

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

Francois Gouget : netapi32: Fix the compilation on Solaris by including errno.h instead of sys/errno.h .
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

Module: wine Branch: master Commit: 625f88c6f3c59f55c3fc0320ea64f46fc7f6cb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=625f88c6f3c59f55c3fc0320e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 2 15:29:04 2011 +0100 netapi32: Fix the compilation on Solaris by including errno.h instead of sys/errno.h. --- dlls/netapi32/access.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index d3b9063..c48c693 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -21,9 +21,7 @@ #include "config.h" #include <stdarg.h> #include <fcntl.h> -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif +#include <errno.h> #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif

1 0

Huw Davies : gdi32: Add support for checking the font's gasp flags.
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

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