May 2011 - Wine-Commits - list.winehq.org

Dylan Smith : d3dxof: Remove assumption of 4 bytes pointers for LPSTR value .
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 0857d2b26bb4bd831cd1ee2de2586e6248c06d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0857d2b26bb4bd831cd1ee2de… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 19 18:35:17 2011 -0400 d3dxof: Remove assumption of 4 bytes pointers for LPSTR value. --- dlls/d3dxof/parsing.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index c3bfba0..417194b 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1140,7 +1140,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) { get_TOKEN(buf); TRACE("%s = %s\n", pt->members[i].name, (char*)buf->value); - if (!check_buffer(buf, 4)) + if (!check_buffer(buf, sizeof(LPSTR))) return FALSE; if (pt->members[i].type == TOKEN_LPSTR) { @@ -1153,7 +1153,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) strcpy((char*)buf->cur_pstrings, (char*)buf->value); *(((LPCSTR*)(buf->cur_pos_data + buf->pdata))) = (char*)buf->cur_pstrings; buf->cur_pstrings += len; - buf->cur_pos_data += 4; + buf->cur_pos_data += sizeof(LPSTR); } else {

1 0

Stefan Dösinger : d3d9: Skip the YUV tests when the driver confuses the U and V channels.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 77c1454cf60cd03a1498323b36bddf25abe45318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c1454cf60cd03a1498323b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 30 22:19:02 2011 +0100 d3d9: Skip the YUV tests when the driver confuses the U and V channels. --- dlls/d3d9/tests/visual.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ffee8de..f3ba3b4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9713,6 +9713,17 @@ static void yuv_color_test(IDirect3DDevice9 *device) { * differently, so we need a max diff of 16 */ color = getPixelColor(device, 40, 240); + + /* Newer versions of the Nvidia Windows driver mix up the U and V channels, breaking all the tests + * where U != V. Skip the entire test if this bug in this case + */ + if (broken(test_data[i].in == 0xff000000 && color == 0x00008800 && format == D3DFMT_UYVY)) + { + skip("Nvidia channel confusion bug detected, skipping YUV tests\n"); + IDirect3DSurface9_Release(surface); + goto out; + } + ok(color_match(color, ref_color_left, 18), "Input 0x%08x: Got color 0x%08x for pixel 1/1, expected 0x%08x, format %s\n", test_data[i].in, color, ref_color_left, fmt_string); @@ -9725,6 +9736,8 @@ static void yuv_color_test(IDirect3DDevice9 *device) { } IDirect3DSurface9_Release(surface); } + +out: IDirect3DSurface9_Release(target); IDirect3D9_Release(d3d); }

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 9298d9767725522b90dbb3f0045b470cb4f22d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9298d9767725522b90dbb3f00… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 19 23:37:01 2011 +0200 po: Update French translation. --- po/fr.po | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index d1a148d..1463345 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8834,9 +8834,8 @@ msgid "&View TypeLib..." msgstr "&Afficher une TypeLib..." #: oleview.rc:32 -#, fuzzy msgid "&System Configuration" -msgstr "&Configuration système..." +msgstr "&Configuration système" #: oleview.rc:33 msgid "&Run the Registry Editor" @@ -9128,7 +9127,6 @@ msgid "&Copy...\tF8" msgstr "C&opier...\tF8" #: progman.rc:35 -#, fuzzy msgid "&Properties\tAlt+Enter" msgstr "&Propriétés\tAlt+Entrée" @@ -9137,7 +9135,6 @@ msgid "&Execute..." msgstr "E&xécuter..." #: progman.rc:39 -#, fuzzy msgid "E&xit Windows" msgstr "&Quitter Windows..."

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 02c5134029e067a34ac6d07ead07bc464be80f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c5134029e067a34ac6d07ea… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed May 18 19:34:34 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/po/lt.po b/po/lt.po index 7c237cb..ae49195 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,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-05-03 21:49+0300\n" +"PO-Revision-Date: 2011-05-19 22:50+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -6843,13 +6843,12 @@ msgid "&About Wine" msgstr "Apie &Wine" #: user32.rc:46 -#, fuzzy msgid "&Close\tCtrl-F4" -msgstr "&Užverti\tAlt-F4" +msgstr "&Užverti\tVald-F4" #: user32.rc:48 msgid "Nex&t\tCtrl-F6" -msgstr "" +msgstr "Ki&tas\tVald-F6" #: user32.rc:68 regedit.rc:176 winefile.rc:100 msgid "Error" @@ -8387,7 +8386,7 @@ msgstr "" #: cmd.rc:283 msgid "Volume label (11 characters, ENTER for none)?" -msgstr "Tomo vardas (11 simbolių, ENTER - bevardis)?" +msgstr "Tomo vardas (11 simbolių, ĮVESTI – bevardis)?" #: cmd.rc:284 msgid "PATH not found\n" @@ -8774,9 +8773,8 @@ msgid "&View TypeLib..." msgstr "&Peržiūrėti TypeLib..." #: oleview.rc:32 -#, fuzzy msgid "&System Configuration" -msgstr "&Sistemos konfigūracija..." +msgstr "&Sistemos konfigūracija" #: oleview.rc:33 msgid "&Run the Registry Editor" @@ -9049,7 +9047,7 @@ msgstr "&Nauja..." #: progman.rc:31 msgid "O&pen\tEnter" -msgstr "&Atverti\tEnter" +msgstr "&Atverti\tĮvesti" #: progman.rc:32 winefile.rc:27 msgid "&Move...\tF7" @@ -9060,18 +9058,16 @@ msgid "&Copy...\tF8" msgstr "&Kopijuoti...\tF8" #: progman.rc:35 -#, fuzzy msgid "&Properties\tAlt+Enter" -msgstr "Savy&bės\tAlt+Enter" +msgstr "Savy&bės\tAlt+Įvesti" #: progman.rc:37 msgid "&Execute..." msgstr "&Vykdyti..." #: progman.rc:39 -#, fuzzy msgid "E&xit Windows" -msgstr "Iš&eiti..." +msgstr "Iš&eiti" #: progman.rc:41 taskmgr.rc:41 winefile.rc:63 winhlp32.rc:44 msgid "&Options" @@ -10779,7 +10775,7 @@ msgstr "(nenustatytas)" #: winefile.rc:26 msgid "&Open\tEnter" -msgstr "&Atverti\tEnter" +msgstr "&Atverti\tĮvesti" #: winefile.rc:30 msgid "Re&name..." @@ -10787,7 +10783,7 @@ msgstr "Per&vadinti..." #: winefile.rc:31 msgid "Propert&ies\tAlt+Enter" -msgstr "Savy&bės\tAlt+Enter" +msgstr "Savy&bės\tAlt+Įvesti" #: winefile.rc:33 msgid "&Run..." @@ -11339,7 +11335,7 @@ msgstr "Neteisingas parametras „%s“ - pagalba: xcopy /?\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" -msgstr "Spauskite <enter> kopijavimui pradėti\n" +msgstr "Spauskite <įvesti> kopijavimui pradėti\n" #: xcopy.rc:30 msgid "%d file(s) would be copied\n"

1 0

Marcus Meissner : gphoto2.ds: Mark a variable with hidden visibility.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 3abe627af5f24b3d8d7e6cbe2dd1f662b9fd1c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3abe627af5f24b3d8d7e6cbe2… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:11:11 2011 +0200 gphoto2.ds: Mark a variable with hidden visibility. --- dlls/gphoto2.ds/gphoto2_i.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 02f5d11..373c6fc 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -101,7 +101,7 @@ struct tagActiveDS struct jpeg_decompress_struct jd; struct jpeg_error_mgr jerr; #endif -} activeDS; +} activeDS DECLSPEC_HIDDEN; /* Helper functions */ extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN;

1 0

Gerald Pfeifer : wineoss.drv: Cope with system which lack SNDCTL_DSP_HALT.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: be57450fee3cbe57300630bbc4b7b80d969c8144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be57450fee3cbe57300630bbc… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu May 19 08:24:23 2011 -0600 wineoss.drv: Cope with system which lack SNDCTL_DSP_HALT. --- dlls/wineoss.drv/mmdevdrv.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 7dec1e0..0edcb25 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -53,6 +53,13 @@ #include "audiopolicy.h" #include "audioclient.h" + +/* Some implementations of OSS, such as FreeBSD older than 9.0, lack + SNDCTL_DSP_HALT which is just a synonym for the older SNDCTL_DSP_RESET. */ +#ifndef SNDCTL_DSP_HALT +#define SNDCTL_DSP_HALT SNDCTL_DSP_RESET +#endif + WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)

1 0

Dylan Smith : d3dx9/tests: Fix a normal comparison for triangles with zero area.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 147e1200495bd947775f6873d420a46d218caa59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147e1200495bd947775f6873d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 19 18:35:02 2011 -0400 d3dx9/tests: Fix a normal comparison for triangles with zero area. --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 5367745..c8853cd 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2785,7 +2785,7 @@ static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, str D3DXVec3Subtract(&v2, vtx3, vtx2); D3DXVec3Cross(&normal, &v1, &v2); D3DXVec3Normalize(&normal, &normal); - ok(compare_vec3(normal, forward), + ok(!D3DXVec3Length(&normal) || compare_vec3(normal, forward), "Test %s, glyph %d, face %d normal, result (%g, %g, %g), expected (%g, %g, %g)\n", name, i, face_idx1, normal.x, normal.y, normal.z, forward.x, forward.y, forward.z); }

1 0

Marcus Meissner : mpr: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: df6eedf9692d619860802e2efc218500cd939565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6eedf9692d619860802e2ef… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:27:14 2011 +0200 mpr: Mark internal symbols with hidden visibility. --- dlls/mpr/wnetpriv.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnetpriv.h b/dlls/mpr/wnetpriv.h index 7a32902..3e744c5 100644 --- a/dlls/mpr/wnetpriv.h +++ b/dlls/mpr/wnetpriv.h @@ -21,7 +21,7 @@ #ifndef __WNET_PRIV_H__ #define __WNET_PRIV_H__ -void wnetInit(HINSTANCE hInstDll); -void wnetFree(void); +void wnetInit(HINSTANCE hInstDll) DECLSPEC_HIDDEN; +void wnetFree(void) DECLSPEC_HIDDEN; #endif /* ndef __WNET_PRIV_H__ */

1 0

Marcus Meissner : mciavi32: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: fb48414419a112358c686a2b7d677977615cb4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb48414419a112358c686a2b7… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:23:16 2011 +0200 mciavi32: Mark internal symbols with hidden visibility. --- dlls/mciavi32/private_mciavi.h | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/mciavi32/private_mciavi.h b/dlls/mciavi32/private_mciavi.h index 548254c..1ee0eb3 100644 --- a/dlls/mciavi32/private_mciavi.h +++ b/dlls/mciavi32/private_mciavi.h @@ -82,32 +82,32 @@ typedef struct { HANDLE ack_event; /* acknowledge that an async command has started */ } WINE_MCIAVI; -extern HINSTANCE MCIAVI_hInstance; +extern HINSTANCE MCIAVI_hInstance DECLSPEC_HIDDEN; /* info.c */ -DWORD MCIAVI_ConvertTimeFormatToFrame(WINE_MCIAVI* wma, DWORD val); -DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms); -DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms); -DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms); -DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpParms); +DWORD MCIAVI_ConvertTimeFormatToFrame(WINE_MCIAVI* wma, DWORD val) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpParms) DECLSPEC_HIDDEN; /* mmoutput.c */ -BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma); -DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr); -BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma); -void MCIAVI_PlayAudioBlocks(WINE_MCIAVI* wma, unsigned nHdr, LPWAVEHDR waveHdr); -LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC); +BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) DECLSPEC_HIDDEN; +DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr) DECLSPEC_HIDDEN; +BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma) DECLSPEC_HIDDEN; +void MCIAVI_PlayAudioBlocks(WINE_MCIAVI* wma, unsigned nHdr, LPWAVEHDR waveHdr) DECLSPEC_HIDDEN; +LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) DECLSPEC_HIDDEN; /* mciavi.c */ -WINE_MCIAVI* MCIAVI_mciGetOpenDev(UINT wDevID); -DWORD MCIAVI_mciClose(UINT, DWORD, LPMCI_GENERIC_PARMS); +WINE_MCIAVI* MCIAVI_mciGetOpenDev(UINT wDevID) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciClose(UINT, DWORD, LPMCI_GENERIC_PARMS) DECLSPEC_HIDDEN; /* wnd.c */ -BOOL MCIAVI_RegisterClass(void); -BOOL MCIAVI_UnregisterClass(void); -BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpOpenParms); -DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms); -DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms); -DWORD MCIAVI_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMSW lpParms); +BOOL MCIAVI_RegisterClass(void) DECLSPEC_HIDDEN; +BOOL MCIAVI_UnregisterClass(void) DECLSPEC_HIDDEN; +BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpOpenParms) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMSW lpParms) DECLSPEC_HIDDEN; #endif /* __WINE_PRIVATE_MCIAVI_H */

1 0

Marcus Meissner : mapi32: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: b93c6dfc69aa99bd06dce326257bd7eeef694ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93c6dfc69aa99bd06dce3262… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:22:13 2011 +0200 mapi32: Mark internal symbols with hidden visibility. --- dlls/mapi32/mapi32_main.c | 4 ++-- dlls/mapi32/util.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 6c35563..e7c1781 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -33,8 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mapi); -LONG MAPI_ObjectCount = 0; -HINSTANCE hInstMAPI32; +DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0; +DECLSPEC_HIDDEN HINSTANCE hInstMAPI32; /*********************************************************************** * DllMain (MAPI32.init) diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h index df03d6e..6fbf81e 100644 --- a/dlls/mapi32/util.h +++ b/dlls/mapi32/util.h @@ -25,8 +25,8 @@ #include <mapi.h> #include <mapix.h> -extern void load_mapi_providers(void); -extern void unload_mapi_providers(void); +extern void load_mapi_providers(void) DECLSPEC_HIDDEN; +extern void unload_mapi_providers(void) DECLSPEC_HIDDEN; typedef struct MAPI_FUNCTIONS { LPMAPIADDRESS MAPIAddress; @@ -60,7 +60,7 @@ typedef struct MAPI_FUNCTIONS { SCODE (WINAPI *ScInitMapiUtil) (ULONG ulReserved); } MAPI_FUNCTIONS; -extern MAPI_FUNCTIONS mapiFunctions; -extern HINSTANCE hInstMAPI32; +extern MAPI_FUNCTIONS mapiFunctions DECLSPEC_HIDDEN; +extern HINSTANCE hInstMAPI32 DECLSPEC_HIDDEN; #endif

1 0