June 2013 - Wine-Commits - list.winehq.org

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: d6109e3710297eac425a172d8cecd48ad3d6542d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6109e3710297eac425a172d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 17 21:55:56 2013 +0400 po: Update Russian translation. --- po/ru.po | 221 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 110 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6109e3710297eac425a1…

1 0

Henri Verbeet : wined3d: Avoid the position_float4() fixup if the vertex pipe can handle pre-transformed vertices itself.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: 4272d92f93fc9d458822da0b738f2a084e405c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4272d92f93fc9d458822da0b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 17 09:07:48 2013 +0200 wined3d: Avoid the position_float4() fixup if the vertex pipe can handle pre-transformed vertices itself. --- dlls/wined3d/directx.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c97225c..760fa34 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4682,12 +4682,18 @@ static void WINE_GLAPI warn_no_specular_func(const void *data) WARN("GL_EXT_secondary_color not supported\n"); } -static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) +static void wined3d_adapter_init_ffp_attrib_ops(const struct wined3d_adapter *adapter) { + const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + position_funcs[WINED3D_FFP_EMIT_FLOAT1] = invalid_func; position_funcs[WINED3D_FFP_EMIT_FLOAT2] = invalid_func; position_funcs[WINED3D_FFP_EMIT_FLOAT3] = (glAttribFunc)gl_info->gl_ops.gl.p_glVertex3fv; - position_funcs[WINED3D_FFP_EMIT_FLOAT4] = position_float4; + if (!d3d_info->xyzrhw) + position_funcs[WINED3D_FFP_EMIT_FLOAT4] = position_float4; + else + position_funcs[WINED3D_FFP_EMIT_FLOAT4] = (glAttribFunc)gl_info->gl_ops.gl.p_glVertex4fv; position_funcs[WINED3D_FFP_EMIT_D3DCOLOR] = position_d3dcolor; position_funcs[WINED3D_FFP_EMIT_UBYTE4] = invalid_func; position_funcs[WINED3D_FFP_EMIT_SHORT2] = invalid_func; @@ -5031,7 +5037,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - fillGLAttribFuncs(&adapter->gl_info); + wined3d_adapter_init_ffp_attrib_ops(adapter); return TRUE; }

1 0

Aric Stewart : ole32: Do not fail if partial blocks are read.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: df6115aea65c0931c2d579ece8ac15c1dcb113c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6115aea65c0931c2d579ece… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 17 11:28:42 2013 -0500 ole32: Do not fail if partial blocks are read. --- dlls/ole32/storage32.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 5009127..bd076ce 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6226,7 +6226,8 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, { if (!cachedBlock->read) { - if (FAILED(StorageImpl_ReadBigBlock(This->parentStorage, cachedBlock->sector, cachedBlock->data, NULL))) + ULONG read; + if (FAILED(StorageImpl_ReadBigBlock(This->parentStorage, cachedBlock->sector, cachedBlock->data, &read)) && !read) return STG_E_READFAULT; cachedBlock->read = 1; @@ -6310,7 +6311,8 @@ HRESULT BlockChainStream_WriteAt(BlockChainStream* This, { if (!cachedBlock->read && bytesToWrite != This->parentStorage->bigBlockSize) { - if (FAILED(StorageImpl_ReadBigBlock(This->parentStorage, cachedBlock->sector, cachedBlock->data, NULL))) + ULONG read; + if (FAILED(StorageImpl_ReadBigBlock(This->parentStorage, cachedBlock->sector, cachedBlock->data, &read)) && !read) return STG_E_READFAULT; }

1 0

Dmitry Timoshkov : comctl32: Use default GUI font as a fallback instead of a (non-existent) Arial.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: cc086f09ae46c77e6eb4a817ae567294d3f795ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc086f09ae46c77e6eb4a817a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 17 12:31:58 2013 +0900 comctl32: Use default GUI font as a fallback instead of a (non-existent) Arial. --- dlls/comctl32/tab.c | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 229e72b..bd75c88 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1898,7 +1898,6 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect /* Draw the text */ if(infoPtr->dwStyle & TCS_VERTICAL) /* if we are vertical rotate the text and each character */ { - static const WCHAR ArialW[] = { 'A','r','i','a','l',0 }; LOGFONTW logfont; HFONT hFont = 0; INT nEscapement = 900; @@ -1911,21 +1910,11 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect } /* to get a font with the escapement and orientation we are looking for, we need to */ - /* call CreateFontIndirectA, which requires us to set the values of the logfont we pass in */ + /* call CreateFontIndirect, which requires us to set the values of the logfont we pass in */ if (!GetObjectW((infoPtr->hFont) ? - infoPtr->hFont : GetStockObject(SYSTEM_FONT), + infoPtr->hFont : GetStockObject(DEFAULT_GUI_FONT), sizeof(LOGFONTW),&logfont)) - { - INT iPointSize = 9; - - lstrcpyW(logfont.lfFaceName, ArialW); - logfont.lfHeight = -MulDiv(iPointSize, GetDeviceCaps(hdc, LOGPIXELSY), - 72); - logfont.lfWeight = FW_NORMAL; - logfont.lfItalic = 0; - logfont.lfUnderline = 0; - logfont.lfStrikeOut = 0; - } + GetStockObject(DEFAULT_GUI_FONT); logfont.lfEscapement = nEscapement; logfont.lfOrientation = nOrientation;

1 0

Bernhard Übelacker : winedbg: Call DebugActiveProcessStop when detaching.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: b62b740de20269fc4c785faac4b51a314fee7cf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b62b740de20269fc4c785faac… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Fri Jun 14 23:28:35 2013 +0200 winedbg: Call DebugActiveProcessStop when detaching. --- programs/winedbg/tgt_active.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index a264a67..0c8e869 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -946,7 +946,8 @@ static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill) ContinueDebugEvent(dbg_curr_pid, dbg_curr_tid, DBG_CONTINUE); } } - else + + if (!kill) { if (!DebugActiveProcessStop(pcs->pid)) return FALSE; }

1 0

Alexandre Julliard : user.exe: Always pass a resource size to CreateIconFromResourceEx16.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: 4894711768695e19a9f1f0b29efeb99574314e32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4894711768695e19a9f1f0b29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 11:14:20 2013 +0200 user.exe: Always pass a resource size to CreateIconFromResourceEx16. --- dlls/user.exe16/user.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index b99c0ad..9500f59 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2094,6 +2094,7 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c { HGLOBAL16 handle; HRSRC16 hRsrc, hGroupRsrc; + DWORD size; if (!hinst || (flags & LR_LOADFROMFILE)) { @@ -2129,7 +2130,6 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c BITMAPFILEHEADER header; WCHAR path[MAX_PATH], filename[MAX_PATH]; HANDLE file; - DWORD size; filename[0] = 0; if (!(hRsrc = FindResource16( hinst, name, (LPCSTR)RT_BITMAP ))) return 0; @@ -2186,7 +2186,8 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c if (!(handle = LoadResource16( hinst, hRsrc ))) return 0; bits = LockResource16( handle ); - hIcon = CreateIconFromResourceEx16( bits, 0, type == IMAGE_ICON, 0x00030000, cx, cy, flags ); + size = SizeofResource16( hinst, hRsrc ); + hIcon = CreateIconFromResourceEx16( bits, size, type == IMAGE_ICON, 0x00030000, cx, cy, flags ); FreeResource16( handle ); if (hIcon && (flags & LR_SHARED)) add_shared_icon( hinst, hRsrc, hGroupRsrc, hIcon ); @@ -2734,7 +2735,7 @@ WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType ) */ HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew ) { - return CreateIconFromResourceEx16( LockResource16( hResource ), 0, TRUE, + return CreateIconFromResourceEx16( LockResource16( hResource ), 0xffff, TRUE, bNew ? 0x00030000 : 0x00020000, 0, 0, LR_DEFAULTCOLOR ); }

1 0

Rico Schüller : d3dx9: Apply rotationcenter only when a rotation is done.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: ee664704772f4392625f09fd246535b343120863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee664704772f4392625f09fd2… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 17 09:56:20 2013 +0200 d3dx9: Apply rotationcenter only when a rotation is done. --- dlls/d3dx9_36/math.c | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 43911e9..e0cab9e 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -102,13 +102,6 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin D3DXMatrixIdentity(out); - if (rotationcenter) - { - out->u.m[3][0] = -rotationcenter->x; - out->u.m[3][1] = -rotationcenter->y; - out->u.m[3][2] = -rotationcenter->z; - } - if (rotation) { FLOAT temp00, temp01, temp02, temp10, temp11, temp12, temp20, temp21, temp22; @@ -135,15 +128,12 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin if (rotationcenter) { - FLOAT x, y, z; - - x = out->u.m[3][0]; - y = out->u.m[3][1]; - z = out->u.m[3][2]; - - out->u.m[3][0] = x * temp00 + y * temp10 + z * temp20; - out->u.m[3][1] = x * temp01 + y * temp11 + z * temp21; - out->u.m[3][2] = x * temp02 + y * temp12 + z * temp22; + out->u.m[3][0] = rotationcenter->x * (1.0f - temp00) - rotationcenter->y * temp10 + - rotationcenter->z * temp20; + out->u.m[3][1] = rotationcenter->y * (1.0f - temp11) - rotationcenter->x * temp01 + - rotationcenter->z * temp21; + out->u.m[3][2] = rotationcenter->z * (1.0f - temp22) - rotationcenter->x * temp02 + - rotationcenter->y * temp12; } } else @@ -153,13 +143,6 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin out->u.m[2][2] = scaling; } - if (rotationcenter) - { - out->u.m[3][0] += rotationcenter->x; - out->u.m[3][1] += rotationcenter->y; - out->u.m[3][2] += rotationcenter->z; - } - if (translation) { out->u.m[3][0] += translation->x;

1 0

Alexandre Julliard : user32: Center the icon in the caption bar.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: wine Branch: master Commit: 094251496ccb02c0cccca4301e4464e33e423a21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094251496ccb02c0cccca4301… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 19:30:32 2013 +0200 user32: Center the icon in the caption bar. --- dlls/user32/nonclient.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index bc7fcc0..050af90 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -697,11 +697,14 @@ BOOL NC_DrawSysButton (HWND hwnd, HDC hdc, BOOL down) if (hIcon) { RECT rect; + POINT pt; DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); DWORD ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); NC_GetInsideRect( hwnd, COORDS_WINDOW, &rect, style, ex_style ); - DrawIconEx (hdc, rect.left + 2, rect.top + 1, hIcon, + pt.x = rect.left + 2; + pt.y = (rect.top + GetSystemMetrics(SM_CYCAPTION) - GetSystemMetrics(SM_CYSMICON)) / 2; + DrawIconEx (hdc, pt.x, pt.y, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, 0, DI_NORMAL); }

1 0

Francois Gouget : Put out a call for translators.
by Alexandre Julliard June 17, 2013

June 17, 2013

Module: website Branch: master Commit: e56e1d90eea8f9d084b21db25c076f13d54091d5 URL: http://source.winehq.org/git/website.git/?a=commit;h=e56e1d90eea8f9d084b21d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 16 02:24:21 2013 +0200 Put out a call for translators. --- news/en/2013061601.xml | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/news/en/2013061601.xml b/news/en/2013061601.xml new file mode 100644 index 0000000..66457a7 --- /dev/null +++ b/news/en/2013061601.xml @@ -0,0 +1,11 @@ +<news> +<date>June 16, 2013</date> +<title>Translators wanted!</title> +<body> +With Wine now in freeze in preparation for 1.6 there is no better time to +refresh its <a href="http://fgouget.free.fr/wine-po/">20</a> translations and +add new ones. +You're only a PO file away from translating Wine. So check out how to +<a href="http://wiki.winehq.org/Translating">get started</a> and help Wine +reach populations it has never reached before! +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.6-rc2
by Jeremy Newman June 14, 2013

June 14, 2013

Module: website Branch: master Commit: f88c017e08ddff6299ad9d1f475f9cb4a49295b0 URL: http://source.winehq.org/git/website.git/?a=commit;h=f88c017e08ddff6299ad9d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jun 14 20:54:01 2013 +0200 French translation for release 1.6-rc2 --- news/fr/2013061401.xml | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/news/fr/2013061401.xml b/news/fr/2013061401.xml new file mode 100644 index 0000000..bc35bba --- /dev/null +++ b/news/fr/2013061401.xml @@ -0,0 +1,11 @@ +<news> +<date>14 juin 2013</date> +<title>Sortie de Wine 1.6-rc2</title> +<body> + La version de développement 1.6-rc2 de Wine est disponible. + <a href="{$root}/announce/1.6-rc2">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bogues uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.6-rc2.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0