January 2011 - Wine-commits

Michael Stefaniuc : ddrawex: COM cleanup for the IDirectDrawSurface3 iface.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: e415b3828b000d8e809b8ae122f1395fd0ad3bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e415b3828b000d8e809b8ae12… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 25 00:38:05 2011 +0100 ddrawex: COM cleanup for the IDirectDrawSurface3 iface. --- dlls/ddrawex/ddrawex_private.h | 2 +- dlls/ddrawex/surface.c | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index 2b7ed6b..f87ca3a 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -74,7 +74,7 @@ IDirectDraw4 *dd_get_inner(IDirectDraw4 *outer); ******************************************************************************/ typedef struct { - const IDirectDrawSurface3Vtbl *IDirectDrawSurface3_Vtbl; + IDirectDrawSurface3 IDirectDrawSurface3_iface; const IDirectDrawSurface4Vtbl *IDirectDrawSurface4_Vtbl; LONG ref; diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c index 67c4755..8387e5d 100644 --- a/dlls/ddrawex/surface.c +++ b/dlls/ddrawex/surface.c @@ -35,17 +35,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddrawex); ******************************************************************************/ static IDirectDrawSurfaceImpl *impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) { - return (IDirectDrawSurfaceImpl *)((char*)iface - FIELD_OFFSET(IDirectDrawSurfaceImpl, IDirectDrawSurface3_Vtbl)); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_iface); } static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface); -static IDirectDrawSurface3 *dds3_from_impl(IDirectDrawSurfaceImpl *This) -{ - if(!This) return NULL; - return (IDirectDrawSurface3 *) &This->IDirectDrawSurface3_Vtbl; -} - static IDirectDrawSurfaceImpl *impl_from_dds4(IDirectDrawSurface4 *iface) { if(!iface) return NULL; @@ -83,8 +77,8 @@ IDirectDrawSurface4Impl_QueryInterface(IDirectDrawSurface4 *iface, || IsEqualGUID(riid, &IID_IDirectDrawSurface2) || IsEqualGUID(riid, &IID_IDirectDrawSurface) ) { - *obj = dds3_from_impl(This); - IDirectDrawSurface3_AddRef((IDirectDrawSurface3 *) *obj); + *obj = &This->IDirectDrawSurface3_iface; + IDirectDrawSurface3_AddRef(&This->IDirectDrawSurface3_iface); TRACE("(%p) returning IDirectDrawSurface3 interface at %p\n", This, *obj); return S_OK; } @@ -335,10 +329,11 @@ enumsurfaces_thunk_cb(IDirectDrawSurface4 *surf, DDSURFACEDESC2 *desc2, void *vc DDSURFACEDESC desc; TRACE("Thunking back to IDirectDrawSurface3\n"); - IDirectDrawSurface3_AddRef(dds3_from_impl(This)); + IDirectDrawSurface3_AddRef(&This->IDirectDrawSurface3_iface); IDirectDrawSurface3_Release(surf); DDSD2_to_DDSD(desc2, &desc); - return ctx->orig_cb((IDirectDrawSurface *) dds3_from_impl(This), &desc, ctx->orig_ctx); + return ctx->orig_cb((IDirectDrawSurface *)&This->IDirectDrawSurface3_iface, &desc, + ctx->orig_ctx); } static HRESULT WINAPI IDirectDrawSurface3Impl_EnumAttachedSurfaces(IDirectDrawSurface3 *iface, @@ -1166,7 +1161,7 @@ static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawS { if (!iface) return NULL; if (iface->lpVtbl != &IDirectDrawSurface3_Vtbl) return NULL; - return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_Vtbl); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_iface); } /* dds_get_outer @@ -1197,7 +1192,7 @@ IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner) TRACE("Creating new ddrawex surface wrapper for surface %p\n", inner); impl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*impl)); impl->ref = 1; - impl->IDirectDrawSurface3_Vtbl = &IDirectDrawSurface3_Vtbl; + impl->IDirectDrawSurface3_iface.lpVtbl = &IDirectDrawSurface3_Vtbl; impl->IDirectDrawSurface4_Vtbl = &IDirectDrawSurface4_Vtbl; IDirectDrawSurface4_AddRef(inner); impl->parent = inner;

1 0

Vitaliy Margolen : dinput: Fix typo. Found by clang.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 02be0aee726005dd8b9cebcf3940f7b7120b1be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02be0aee726005dd8b9cebcf3… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jan 24 20:36:01 2011 -0700 dinput: Fix typo. Found by clang. --- dlls/dinput/effect_linuxinput.c | 4 ++-- dlls/dinput/tests/joystick.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index b7c27cd..d0e77d6 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -289,8 +289,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetEffectGuid( TRACE("(this=%p,%p)\n", This, pguid); - pguid = &This->guid; - + *pguid = This->guid; + return DI_OK; } diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index aad8049..a60d6e2 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -375,6 +375,7 @@ static BOOL CALLBACK EnumJoysticks( { DWORD effect_status; struct DIPROPDWORD diprop_word; + GUID guid = {0}; hr = IDirectInputEffect_Initialize(effect, hInstance, data->version, &GUID_ConstantForce); @@ -429,6 +430,9 @@ static BOOL CALLBACK EnumJoysticks( hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); todo_wine ok(effect_status!=0,"IDirectInputEffect_GetEffectStatus() reported effect as stopped\n"); + hr = IDirectInputEffect_GetEffectGuid(effect, &guid); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectGuid() failed: %08x\n", hr); + ok(IsEqualGUID(&GUID_ConstantForce, &guid), "Wrong guid returned\n"); /* Check autocenter status * State: initialy stopped

1 0

Alexandre Julliard : winefile: Recover some resources that were lost during the po conversion.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 3cad6ebae9d189736e814c311ec93c07e34cb894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cad6ebae9d189736e814c311… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 12:11:02 2011 +0100 winefile: Recover some resources that were lost during the po conversion. --- programs/winefile/It.rc | 13 +++++++++++++ programs/winefile/Ja.rc | 13 +++++++++++++ programs/winefile/Lt.rc | 13 +++++++++++++ 3 files changed, 39 insertions(+), 0 deletions(-) diff --git a/programs/winefile/It.rc b/programs/winefile/It.rc index 8ea1453..b488dec 100644 --- a/programs/winefile/It.rc +++ b/programs/winefile/It.rc @@ -30,6 +30,19 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Seleziona destinazione" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Percorso:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "Annulla", 2, 158, 23, 47, 14 + PUSHBUTTON "&Naviga", 254, 158, 43, 47, 14 +} + IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Per tipo di file" diff --git a/programs/winefile/Ja.rc b/programs/winefile/Ja.rc index e6f6b1c..594e39b 100644 --- a/programs/winefile/Ja.rc +++ b/programs/winefile/Ja.rc @@ -28,6 +28,19 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "移動先を選択" +FONT 9, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "パス(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "キャンセル", 2, 158, 23, 47, 14 + PUSHBUTTON "参照(&B)", 254, 158, 43, 47, 14 +} + IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "By File Type" diff --git a/programs/winefile/Lt.rc b/programs/winefile/Lt.rc index 1f98e21..91e6e12 100644 --- a/programs/winefile/Lt.rc +++ b/programs/winefile/Lt.rc @@ -26,6 +26,19 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Išrinkite paskirtį" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Kelias:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "Gerai", 1, 158, 6, 47, 14 + PUSHBUTTON "Atsisakyti", 2, 158, 23, 47, 14 + PUSHBUTTON "&Parinkti", 254, 158, 43, 47, 14 +} + IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Pagal failo tipą"

1 0

Alexandre Julliard : iccvid: Recover some resources that were lost during the po conversion.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 361bb1f218c382a4651a78a14e8b6c3eae43a024 URL: http://source.winehq.org/git/wine.git/?a=commit;h=361bb1f218c382a4651a78a14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 12:30:22 2011 +0100 iccvid: Recover some resources that were lost during the po conversion. --- po/da.po | 2 +- po/es.po | 2 +- po/fr.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt_BR.po | 2 +- po/pt_PT.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/sl.po | 2 +- po/sr_RS(a)cyrillic.po | 2 +- po/sr_RS(a)latin.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/po/da.po b/po/da.po index d0492de..9da8417 100644 --- a/po/da.po +++ b/po/da.po @@ -2191,7 +2191,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Cinepak videokodeks" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/es.po b/po/es.po index 5e05385..5a6c5b3 100644 --- a/po/es.po +++ b/po/es.po @@ -2176,7 +2176,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Códec de vídeo Cinepak" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/fr.po b/po/fr.po index eef6c59..16e42e5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2220,7 +2220,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Codec vidéo Cinepak" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/hu.po b/po/hu.po index d9992d4..58cc5a2 100644 --- a/po/hu.po +++ b/po/hu.po @@ -2197,7 +2197,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Cinepak Video kodek" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/it.po b/po/it.po index b4bee99..2d55118 100644 --- a/po/it.po +++ b/po/it.po @@ -2278,7 +2278,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Codec video Cinepak" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/ja.po b/po/ja.po index 8fc1adc..67294e1 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2184,7 +2184,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Cinepak ビデオコーデック" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/nb_NO.po b/po/nb_NO.po index dc96159..c03a2b1 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -2255,7 +2255,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Cinepak-videokodek" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/nl.po b/po/nl.po index 6440e6a..404c136 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2296,7 +2296,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Cinepak Video codec" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/pl.po b/po/pl.po index 41ceb76..901e6f5 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2217,7 +2217,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Kodek Cinepak Video" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/pt_BR.po b/po/pt_BR.po index bcc0680..5c80f65 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2257,7 +2257,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Codec Video Cinepak" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/pt_PT.po b/po/pt_PT.po index f996516..ca31ffb 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -2285,7 +2285,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Codec Video Cinepak" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/ro.po b/po/ro.po index a8b1a05..f67bc4c 100644 --- a/po/ro.po +++ b/po/ro.po @@ -2311,7 +2311,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Codecul Cinepak Video" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/ru.po b/po/ru.po index fa49111..5acbf9e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2191,7 +2191,7 @@ msgstr "Предыдущая глава" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Видео кодер-декодер Cinepak" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/sl.po b/po/sl.po index 1741d69..66cc673 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2182,7 +2182,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Cinepak Video kodek" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/sr_RS(a)cyrillic.po b/po/sr_RS(a)cyrillic.po index dafd045..99644de 100644 --- a/po/sr_RS(a)cyrillic.po +++ b/po/sr_RS(a)cyrillic.po @@ -2160,7 +2160,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Cinepak видео кодек" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/sr_RS(a)latin.po b/po/sr_RS(a)latin.po index 48177a3..bab9501 100644 --- a/po/sr_RS(a)latin.po +++ b/po/sr_RS(a)latin.po @@ -2184,7 +2184,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Cinepak video kodek" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/tr.po b/po/tr.po index a352f0a..aa21fdf 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2170,7 +2170,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Cinepak Vidyo çözücü" #: inetcpl.rc:28 msgid "Internet Settings" diff --git a/po/uk.po b/po/uk.po index b8da57a..4db93f4 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2189,7 +2189,7 @@ msgstr "IDTB_TOC_PREV" #: iccvid.rc:25 iccvid.rc:26 msgid "Cinepak Video codec" -msgstr "" +msgstr "Відео кодек Cinepak" #: inetcpl.rc:28 msgid "Internet Settings"

1 0

Henri Verbeet : wined3d: Disable vertex shader output clamping.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 91ac0c37b1f36978d8bf974daf24ad9c77d49d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ac0c37b1f36978d8bf974da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 24 18:41:16 2011 +0100 wined3d: Disable vertex shader output clamping. It looks like NV50+ hardware gets you infinities and NaN's in D3D as well for most things, so we should only need special handling for pow and nrm. --- dlls/d3d9/tests/visual.c | 42 +++++++++++++++++------------------------- dlls/wined3d/glsl_shader.c | 27 +++++++++++++-------------- 2 files changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index db67be3..d01252d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11233,8 +11233,9 @@ static void fp_special_test(IDirect3DDevice9 *device) const char *name; const DWORD *ops; DWORD size; - D3DCOLOR color1; - D3DCOLOR color2; + D3DCOLOR r600; + D3DCOLOR nv40; + D3DCOLOR nv50; } vs_body[] = { @@ -11248,26 +11249,15 @@ static void fp_special_test(IDirect3DDevice9 *device) * component, but here 0.0 also results in 0x00. The actual value is * written to the blue component. * - * There are at least two different ways for D3D implementations to - * handle this. AMD seems to stick mostly to the D3D documentation, - * and doesn't generate floating point specials in the first place. - * Note that that doesn't just apply to functions like rcp and rsq, - * but also basic mul, add, etc. nVidia seems to generate infinities, - * but then clamp them before sending them to the interpolators. In - * OpenGL these aren't clamped, and interpolating them generates NANs - * in the fragment shader, unless flat shading is used (essentially - * replicating the values instead of interpolating them). - * - * I can't currently explain the nVidia results for pow and nrm. - * They're not specials in the vertex shader, but look like -INF in - * the pixel shader. */ - {"log", vs_log, sizeof(vs_log), 0x00000000 /* -FLT_MAX */, 0x00ff0000 /* clamp(-INF) */}, - {"pow", vs_pow, sizeof(vs_pow), 0x000000ff /* +FLT_MAX */, 0x0000ff00 /* ??? */}, - {"nrm", vs_nrm, sizeof(vs_nrm), 0x00ff0000 /* 0.0 */, 0x0000ff00 /* ??? */}, - {"rcp1", vs_rcp1, sizeof(vs_rcp1), 0x000000ff /* +FLT_MAX */, 0x00ff00ff /* clamp(+INF) */}, - {"rcp2", vs_rcp2, sizeof(vs_rcp2), 0x00000000 /* -FLT_MAX */, 0x00ff0000 /* clamp(-INF) */}, - {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff /* +FLT_MAX */, 0x00ff00ff /* clamp(+INF) */}, - {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff /* +FLT_MAX */, 0x00ff00ff /* clamp(+INF) */}, + * There are considerable differences between graphics cards in how + * these are handled, but pow and nrm never generate INF or NAN. */ + {"log", vs_log, sizeof(vs_log), 0x00000000, 0x00ff0000, 0x00ff7f00}, + {"pow", vs_pow, sizeof(vs_pow), 0x000000ff, 0x0000ff00, 0x000000ff}, + {"nrm", vs_nrm, sizeof(vs_nrm), 0x00ff0000, 0x0000ff00, 0x00ff0000}, + {"rcp1", vs_rcp1, sizeof(vs_rcp1), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, + {"rcp2", vs_rcp2, sizeof(vs_rcp2), 0x00000000, 0x00ff0000, 0x00ff7f00}, + {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, + {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, }; static const DWORD ps_code[] = @@ -11371,9 +11361,11 @@ static void fp_special_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok(color_match(color, vs_body[i].color1, 1) || color_match(color, vs_body[i].color2, 1), - "Expected color 0x%08x or 0x%08x for instruction \"%s\", got 0x%08x.\n", - vs_body[i].color1, vs_body[i].color2, vs_body[i].name, color); + ok(color_match(color, vs_body[i].r600, 1) + || color_match(color, vs_body[i].nv40, 1) + || color_match(color, vs_body[i].nv50, 1), + "Expected color 0x%08x, 0x%08x or 0x%08x for instruction \"%s\", got 0x%08x.\n", + vs_body[i].r600, vs_body[i].nv40, vs_body[i].nv50, vs_body[i].name, color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c4e4188..efd6d55 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2222,13 +2222,13 @@ static void shader_glsl_pow(const struct wined3d_shader_instruction *ins) if (dst_size > 1) { - shader_addline(buffer, "vec%u(pow(abs(%s), %s)));\n", - dst_size, src0_param.param_str, src1_param.param_str); + shader_addline(buffer, "vec%u(%s == 0.0 ? 1.0 : pow(abs(%s), %s)));\n", + dst_size, src1_param.param_str, src0_param.param_str, src1_param.param_str); } else { - shader_addline(buffer, "pow(abs(%s), %s));\n", - src0_param.param_str, src1_param.param_str); + shader_addline(buffer, "%s == 0.0 ? 1.0 : pow(abs(%s), %s));\n", + src1_param.param_str, src0_param.param_str, src1_param.param_str); } } @@ -3799,7 +3799,7 @@ static void handle_ps3_input(struct wined3d_shader_buffer *buffer, set[in_idx] = mask; shader_glsl_write_mask_to_str(mask, reg_mask); - shader_addline(buffer, "%s%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + shader_addline(buffer, "%s%s = OUT[%u]%s;\n", destination, reg_mask, j, reg_mask); } } @@ -3847,7 +3847,6 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer shader_buffer_clear(buffer); shader_addline(buffer, "#version 120\n"); - shader_addline(buffer, "const float FLT_MAX = 1e38;\n"); if (ps_major < 3) { @@ -3867,15 +3866,15 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_COLOR)) { if (!semantic_idx) - shader_addline(buffer, "gl_FrontColor%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + shader_addline(buffer, "gl_FrontColor%s = OUT[%u]%s;\n", reg_mask, i, reg_mask); else if (semantic_idx == 1) - shader_addline(buffer, "gl_FrontSecondaryColor%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + shader_addline(buffer, "gl_FrontSecondaryColor%s = OUT[%u]%s;\n", reg_mask, i, reg_mask); } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_POSITION)) { - shader_addline(buffer, "gl_Position%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + shader_addline(buffer, "gl_Position%s = OUT[%u]%s;\n", reg_mask, i, reg_mask); } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_TEXCOORD)) @@ -3885,7 +3884,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer if (!(gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) || ps_major > 0) write_mask |= WINED3DSP_WRITEMASK_3; - shader_addline(buffer, "gl_TexCoord[%u]%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + shader_addline(buffer, "gl_TexCoord[%u]%s = OUT[%u]%s;\n", semantic_idx, reg_mask, i, reg_mask); if (!(write_mask & WINED3DSP_WRITEMASK_3)) shader_addline(buffer, "gl_TexCoord[%u].w = 1.0;\n", semantic_idx); @@ -3893,11 +3892,11 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_PSIZE)) { - shader_addline(buffer, "gl_PointSize = clamp(OUT[%u].%c, -FLT_MAX, FLT_MAX);\n", i, reg_mask[1]); + shader_addline(buffer, "gl_PointSize = OUT[%u].%c;\n", i, reg_mask[1]); } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_FOG)) { - shader_addline(buffer, "gl_FogFragCoord = clamp(OUT[%u].%c, -FLT_MAX, FLT_MAX);\n", i, reg_mask[1]); + shader_addline(buffer, "gl_FogFragCoord = OUT[%u].%c;\n", i, reg_mask[1]); } } shader_addline(buffer, "}\n"); @@ -3919,12 +3918,12 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_POSITION)) { - shader_addline(buffer, "gl_Position%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + shader_addline(buffer, "gl_Position%s = OUT[%u]%s;\n", reg_mask, i, reg_mask); } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_PSIZE)) { - shader_addline(buffer, "gl_PointSize = clamp(OUT[%u].%c, -FLT_MAX, FLT_MAX);\n", i, reg_mask[1]); + shader_addline(buffer, "gl_PointSize = OUT[%u].%c;\n", i, reg_mask[1]); } }

1 0

André Hentschel : gameux: Only trace on success (clang ).
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 3e411a2d9ce2c856b7063d84cf8cfe1800d89600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e411a2d9ce2c856b7063d84c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 24 20:43:07 2011 +0100 gameux: Only trace on success (clang). --- dlls/gameux/gamestatistics.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 61df25e..b0e7674 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -564,11 +564,12 @@ static HRESULT GAMEUX_loadStatisticsFromFile(struct GAMEUX_STATS *data) } if(SUCCEEDED(hr)) + { lstrcpynW(data->categories[i].stats[j].sValue, V_BSTR(&vValue), MAX_VALUE_LENGTH); - - TRACE(" statistic %d name %s value %s\n", j, - debugstr_w(data->categories[i].stats[j].sName), - debugstr_w(data->categories[i].stats[j].sValue)); + TRACE("statistic %d name %s value %s\n", j, + debugstr_w(data->categories[i].stats[j].sName), + debugstr_w(data->categories[i].stats[j].sValue)); + } IXMLDOMElement_Release(statisticElement); }

1 0

Alexandre Julliard : kernel32: Convert message translations to po files.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: efa55fd2bff0121ff888f4357d3a0b1db77a4bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=efa55fd2bff0121ff888f4357… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 24 20:42:52 2011 +0100 kernel32: Convert message translations to po files. --- dlls/kernel32/Makefile.in | 17 +- dlls/kernel32/nls/winerr_dan.mc | 3742 --------------------- dlls/kernel32/nls/winerr_deu.mc | 3741 --------------------- dlls/kernel32/nls/winerr_fra.mc | 3742 --------------------- dlls/kernel32/nls/winerr_ita.mc | 3742 --------------------- dlls/kernel32/nls/winerr_jpn.mc | 3744 ---------------------- dlls/kernel32/nls/winerr_kor.mc | 3737 --------------------- dlls/kernel32/nls/winerr_lth.mc | 3741 --------------------- dlls/kernel32/nls/winerr_nld.mc | 3742 --------------------- dlls/kernel32/nls/winerr_nor.mc | 3742 --------------------- dlls/kernel32/nls/winerr_plk.mc | 3741 --------------------- dlls/kernel32/nls/winerr_ptb.mc | 3742 --------------------- dlls/kernel32/nls/winerr_ptg.mc | 3741 --------------------- dlls/kernel32/nls/winerr_rus.mc | 3741 --------------------- dlls/kernel32/nls/winerr_sve.mc | 3741 --------------------- dlls/kernel32/nls/winerr_ukr.mc | 3742 --------------------- dlls/kernel32/{nls/winerr_enu.mc => winerror.mc} | 0 po/ar.po | 2971 +++++++++++++++++ po/bg.po | 3041 ++++++++++++++++++ po/ca.po | 2959 +++++++++++++++++ po/cs.po | 3076 ++++++++++++++++++ po/da.po | 2957 +++++++++++++++++ po/de.po | 2958 +++++++++++++++++ po/el.po | 3009 +++++++++++++++++ po/en.po | 2956 +++++++++++++++++ po/en_US.po | 2956 +++++++++++++++++ po/eo.po | 3023 +++++++++++++++++ po/es.po | 3166 ++++++++++++++++++ po/fa.po | 2971 +++++++++++++++++ po/fi.po | 3051 ++++++++++++++++++ po/fr.po | 2963 +++++++++++++++++ po/he.po | 3138 ++++++++++++++++++- po/hi.po | 2957 +++++++++++++++++ po/hu.po | 3158 ++++++++++++++++++ po/it.po | 2957 +++++++++++++++++ po/ja.po | 2961 +++++++++++++++++ po/ko.po | 2956 +++++++++++++++++ po/lt.po | 2958 +++++++++++++++++ po/ml.po | 2957 +++++++++++++++++ po/nb_NO.po | 2956 +++++++++++++++++ po/nl.po | 2956 +++++++++++++++++ po/or.po | 2957 +++++++++++++++++ po/pa.po | 2957 +++++++++++++++++ po/pl.po | 2956 +++++++++++++++++ po/pt_BR.po | 2956 +++++++++++++++++ po/pt_PT.po | 2956 +++++++++++++++++ po/rm.po | 2972 +++++++++++++++++ po/ro.po | 3181 ++++++++++++++++++ po/ru.po | 2956 +++++++++++++++++ po/sk.po | 3017 +++++++++++++++++ po/sl.po | 3138 ++++++++++++++++++ po/sr_RS(a)cyrillic.po | 3129 ++++++++++++++++++ po/sr_RS(a)latin.po | 3146 ++++++++++++++++++ po/sv.po | 2956 +++++++++++++++++ po/te.po | 2957 +++++++++++++++++ po/th.po | 3008 +++++++++++++++++ po/tr.po | 3155 ++++++++++++++++++ po/uk.po | 2956 +++++++++++++++++ po/wa.po | 2972 +++++++++++++++++ po/wine.pot | 2956 +++++++++++++++++ po/zh_CN.po | 3099 ++++++++++++++++++ po/zh_TW.po | 3103 ++++++++++++++++++ 62 files changed, 135493 insertions(+), 56139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efa55fd2bff0121ff888f…

1 0

Alexandre Julliard : wmc: Add a copy of the strmake utility function.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 46ecc16deb1a3d2c2ffcf57085252796801759a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ecc16deb1a3d2c2ffcf5708… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 24 20:05:00 2011 +0100 wmc: Add a copy of the strmake utility function. --- tools/wmc/utils.c | 21 +++++++++++++++++++-- tools/wmc/utils.h | 1 + 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index 88dd45f..6f26da3 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -138,7 +138,6 @@ void *xmalloc(size_t size) void *res; assert(size > 0); - assert(size < 102400); res = malloc(size); if(res == NULL) { @@ -154,7 +153,6 @@ void *xrealloc(void *p, size_t size) void *res; assert(size > 0); - assert(size < 102400); res = realloc(p, size); if(res == NULL) { @@ -172,6 +170,25 @@ char *xstrdup(const char *str) return strcpy(s, str); } +char *strmake( const char* fmt, ... ) +{ + int n; + size_t size = 100; + va_list ap; + + for (;;) + { + char *p = xmalloc( size ); + va_start( ap, fmt ); + n = vsnprintf( p, size, fmt, ap ); + va_end( ap ); + if (n == -1) size *= 2; + else if ((size_t)n >= size) size = n + 1; + else return p; + free( p ); + } +} + int unistrlen(const WCHAR *s) { int n; diff --git a/tools/wmc/utils.h b/tools/wmc/utils.h index bef1abf..909cc99 100644 --- a/tools/wmc/utils.h +++ b/tools/wmc/utils.h @@ -33,6 +33,7 @@ char *xstrdup(const char *str); #define __attribute__(X) #endif +char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); int mcy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int xyyerror(const char *s, ...) __attribute__((format (printf, 1, 2))); int mcy_warning(const char *s, ...) __attribute__((format (printf, 1, 2)));

1 0

Alexandre Julliard : wmc: Store input file location for each individual message.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 45dc5bf6b2bcaf5fd882cf69fc65cab2e7196bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45dc5bf6b2bcaf5fd882cf69f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 24 20:05:34 2011 +0100 wmc: Store input file location for each individual message. --- tools/wmc/mcy.y | 4 +++- tools/wmc/wmctypes.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 5de67c9..54403d5 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -441,6 +441,8 @@ static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg) lmp->cp = lcp->codepage; lmp->msg = msg; lmp->len = unistrlen(msg) + 1; /* Include termination */ + lmp->file = input_name; + lmp->line = line_number; if(lmp->len > 4096) mcy_warning("Message exceptionally long; might be a missing termination\n"); return lmp; @@ -522,7 +524,7 @@ static void test_id(int id) static int check_languages(node_t *head) { - static const char err_missing[] = "Missing definition for language 0x%x; MessageID %d, facility 0x%x, severity 0x%x"; + static const char err_missing[] = "Missing definition for language 0x%x; MessageID %d, facility 0x%x, severity 0x%x\n"; node_t *ndp; int nm = 0; msg_t *msg = NULL; diff --git a/tools/wmc/wmctypes.h b/tools/wmc/wmctypes.h index 0b38089..483507a 100644 --- a/tools/wmc/wmctypes.h +++ b/tools/wmc/wmctypes.h @@ -73,6 +73,8 @@ typedef struct lanmsg { int cp; /* Codepage of message */ WCHAR *msg; /* Message text */ int len; /* Message length including trailing '\0' */ + const char *file; /* File location for definition */ + int line; } lanmsg_t; typedef struct msg {

1 0

Alexandre Julliard : wmc: Add support for generating a po template file.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 196ffdf671de98c5d22b62f5ba669a7760227a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=196ffdf671de98c5d22b62f5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 24 20:09:53 2011 +0100 wmc: Add support for generating a po template file. --- tools/wmc/Makefile.in | 9 +- tools/wmc/po.c | 445 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/wmc/wmc.c | 9 +- tools/wmc/wmc.man.in | 4 +- tools/wmc/write.h | 1 + 5 files changed, 460 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=196ffdf671de98c5d22b6…

1 0