March 2008 - Wine-commits - list.winehq.org

Michael Stefaniuc : msvidc32: Add the Romanian translation.
by Alexandre Julliard 19 Mar '08

19 Mar '08

Module: wine Branch: master Commit: 2b4c863f273eb82fba6a0fc099c0b2a1df5acaba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4c863f273eb82fba6a0fc09… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 18 23:26:33 2008 +0100 msvidc32: Add the Romanian translation. --- dlls/msvidc32/msvidc32_Ro.rc | 26 ++++++++++++++++++++++++++ dlls/msvidc32/rsrc.rc | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/msvidc32_Ro.rc b/dlls/msvidc32/msvidc32_Ro.rc new file mode 100644 index 0000000..fa7584a --- /dev/null +++ b/dlls/msvidc32/msvidc32_Ro.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2008 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "MS-CRAM" + IDS_DESCRIPTION "Codecul video Wine Video 1" +} diff --git a/dlls/msvidc32/rsrc.rc b/dlls/msvidc32/rsrc.rc index a7958e9..34f3980 100644 --- a/dlls/msvidc32/rsrc.rc +++ b/dlls/msvidc32/rsrc.rc @@ -27,5 +27,6 @@ #include "msvidc32_Nl.rc" #include "msvidc32_No.rc" #include "msvidc32_Pl.rc" +#include "msvidc32_Ro.rc" #include "msvidc32_Sv.rc" #include "msvidc32_Tr.rc"

1 0

Michael Stefaniuc : iccvid: Add the Romanian translation.
by Alexandre Julliard 19 Mar '08

19 Mar '08

Module: wine Branch: master Commit: b72021ef85363fe47b5b05e7f3b434ec3fa38626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72021ef85363fe47b5b05e7f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 18 23:26:04 2008 +0100 iccvid: Add the Romanian translation. --- dlls/iccvid/iccvid_Ro.rc | 26 ++++++++++++++++++++++++++ dlls/iccvid/rsrc.rc | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid_Ro.rc b/dlls/iccvid/iccvid_Ro.rc new file mode 100644 index 0000000..85cb1da --- /dev/null +++ b/dlls/iccvid/iccvid_Ro.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2008 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Codecul Cinepak Video" + IDS_DESCRIPTION "Codecul Cinepak Video" +} diff --git a/dlls/iccvid/rsrc.rc b/dlls/iccvid/rsrc.rc index e849555..baa9fb3 100644 --- a/dlls/iccvid/rsrc.rc +++ b/dlls/iccvid/rsrc.rc @@ -27,5 +27,6 @@ #include "iccvid_Nl.rc" #include "iccvid_No.rc" #include "iccvid_Pl.rc" +#include "iccvid_Ro.rc" #include "iccvid_Sv.rc" #include "iccvid_Tr.rc"

1 0

Maarten Lankhorst : winemp3: Skip idv3 header too.
by Alexandre Julliard 19 Mar '08

19 Mar '08

Module: wine Branch: master Commit: 2756bedd8aa0a191f6d3d64d16cb41b8d6331303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2756bedd8aa0a191f6d3d64d1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Mar 18 14:50:55 2008 -0700 winemp3: Skip idv3 header too. --- dlls/winemp3.acm/mpegl3.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 3d18c9e..5020783 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -145,6 +145,23 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, DWORD buffered_during; DWORD buffered_after; + /* Skip leading ID v3 header */ + if (amd->mp.fsizeold == -1 && !strncmp("ID3", (char*)src, 3)) + { + UINT length = 10; + const char *header = (char *)src; + + TRACE("Found ID3 v2.%d.%d\n", header[3], header[4]); + length += (header[6] & 0x7F) << 21; + length += (header[7] & 0x7F) << 14; + length += (header[8] & 0x7F) << 7; + length += (header[9] & 0x7F); + TRACE("Length: %u\n", length); + *nsrc = length; + *ndst = 0; + return; + } + buffered_before = get_num_buffered_bytes(&amd->mp); ret = decodeMP3(&amd->mp, src, *nsrc, dst, *ndst, &size); buffered_during = get_num_buffered_bytes(&amd->mp);

1 0

Maarten Lankhorst : quartz: Fix the magic bytes for mp3's with id3 tags.
by Alexandre Julliard 19 Mar '08

19 Mar '08

Module: wine Branch: master Commit: 24708e4edb1c664b624505b15eb4df06a56e5036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24708e4edb1c664b624505b15… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Mar 18 16:10:56 2008 -0700 quartz: Fix the magic bytes for mp3's with id3 tags. --- dlls/quartz/regsvr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 2a2b45d..cc178e3 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -974,7 +974,7 @@ static struct regsvr_mediatype_parsing const mediatype_parsing_list[] = { { &MEDIATYPE_Stream, &MEDIASUBTYPE_MPEG1Audio, { "0, 2, FFE0, FFE0", - "0, 10, FFFFFFFF000000000000, 494433030080808080", + "0, 10, FFFFFF00000080808080, 494433000000000000", NULL } }, { &MEDIATYPE_Stream,

1 0

Dan Hipschman : widl: Ignore libraries in imported IDL files.
by Alexandre Julliard 19 Mar '08

19 Mar '08

Module: wine Branch: master Commit: d37b1a4969896d69d782b7ec55fc4e85690af0a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37b1a4969896d69d782b7ec5… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Mar 18 18:30:28 2008 -0700 widl: Ignore libraries in imported IDL files. --- tools/widl/parser.y | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 499ae15..aff7c4c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -320,6 +320,7 @@ imp_statements: {} | imp_statements moduledef { if (!parse_only) add_typelib_entry($2); } | imp_statements statement {} | imp_statements importlib {} + | imp_statements librarydef {} ; int_statements: { $$ = NULL; } @@ -363,12 +364,12 @@ importlib: tIMPORTLIB '(' aSTRING ')' { if(!parse_only) add_importlib($3); } libraryhdr: tLIBRARY aIDENTIFIER { $$ = $2; } ; -library_start: attributes libraryhdr '{' { start_typelib($2, $1); +library_start: attributes libraryhdr '{' { if (!parse_only) start_typelib($2, $1); if (!parse_only && do_header) write_library($2, $1); if (!parse_only && do_idfile) write_libid($2, $1); } ; -librarydef: library_start imp_statements '}' { end_typelib(); } +librarydef: library_start imp_statements '}' { if (!parse_only) end_typelib(); } ; m_args: { $$ = NULL; }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 19 Mar '08

19 Mar '08

Module: wine Branch: master Commit: 304b415284aab7d32671fc8b1f15f6d3fb28940c URL: http://source.winehq.org/git/wine.git/?a=commit;h=304b415284aab7d32671fc8b1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 18 15:21:13 2008 +0100 Assorted spelling fixes. --- dlls/advapi32/tests/security.c | 2 +- dlls/d3dx9_24/d3dx9_24_main.c | 2 +- dlls/d3dx9_25/d3dx9_25_main.c | 2 +- dlls/d3dx9_26/d3dx9_26_main.c | 2 +- dlls/d3dx9_27/d3dx9_27_main.c | 2 +- dlls/d3dx9_28/d3dx9_28_main.c | 2 +- dlls/d3dx9_29/d3dx9_29_main.c | 2 +- dlls/d3dx9_30/d3dx9_30_main.c | 2 +- dlls/d3dx9_31/d3dx9_31_main.c | 2 +- dlls/d3dx9_32/d3dx9_32_main.c | 2 +- dlls/d3dx9_33/d3dx9_33_main.c | 2 +- dlls/d3dx9_34/d3dx9_34_main.c | 2 +- dlls/d3dx9_35/d3dx9_35_main.c | 2 +- dlls/d3dx9_36/d3dx9_36_main.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/node.c | 2 +- dlls/msxml3/tests/domdoc.c | 2 +- dlls/msxml3/text.c | 2 +- dlls/qmgr/tests/enum_files.c | 2 +- dlls/qmgr/tests/enum_jobs.c | 2 +- dlls/qmgr/tests/file.c | 4 ++-- dlls/qmgr/tests/job.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- programs/cmd/wcmdmain.c | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=304b415284aab7d32671f…

1 0

Dan Kegel : shell32: Only print " HCR_GetFolderAttributes should be called for simple PIDL's" once.
by Alexandre Julliard 19 Mar '08

19 Mar '08

Module: wine Branch: master Commit: c5b499d37a8824b953e5cee9df674ef052a53ef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b499d37a8824b953e5cee9d… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Mar 18 14:34:51 2008 -0700 shell32: Only print "HCR_GetFolderAttributes should be called for simple PIDL's" once. --- dlls/shell32/classes.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index d17a31c..e5fab4d 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -438,7 +438,11 @@ BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD pdwAttributes) TRACE("(pidlFolder=%p, pdwAttributes=%p)\n", pidlFolder, pdwAttributes); if (!_ILIsPidlSimple(pidlFolder)) { - ERR("HCR_GetFolderAttributes should be called for simple PIDL's only!\n"); + static int firstHit = 1; + if (firstHit) { + ERR("HCR_GetFolderAttributes should be called for simple PIDL's only!\n"); + firstHit = 0; + } return FALSE; }

1 0

Andrew Talbot : twain_32: Assign to structs instead of using memcpy.
by Alexandre Julliard 19 Mar '08

19 Mar '08

Module: wine Branch: master Commit: 39f138a298c0f1f498648512a8dae7d639de21ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f138a298c0f1f498648512a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 18 21:42:17 2008 +0000 twain_32: Assign to structs instead of using memcpy. --- dlls/twain_32/dsm_ctrl.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 60928e7..b07d2b8 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -88,7 +88,7 @@ twain_add_onedriver(const char *dsname) { else devices = malloc(sizeof(devices[0])); devices[nrdevices].modname = strdup(dsname); - memcpy (&devices[nrdevices].identity, &sourceId, sizeof(sourceId)); + devices[nrdevices].identity = sourceId; nrdevices++; DSM_sourceId++; } while (1); @@ -155,7 +155,7 @@ TW_UINT16 TWAIN_IdentityGetDefault (pTW_IDENTITY pOrigin, TW_MEMREF pData) twain_autodetect(); if (!nrdevices) return TWRC_FAILURE; - memcpy (pSourceIdentity, &devices[0].identity, sizeof(TW_IDENTITY)); + *pSourceIdentity = devices[0].identity; return TWRC_SUCCESS; } @@ -172,7 +172,7 @@ TW_UINT16 TWAIN_IdentityGetFirst (pTW_IDENTITY pOrigin, TW_MEMREF pData) return TWRC_ENDOFLIST; } DSM_currentDevice = 0; - memcpy (pSourceIdentity, &devices[DSM_currentDevice++].identity, sizeof(TW_IDENTITY)); + *pSourceIdentity = devices[DSM_currentDevice++].identity; return TWRC_SUCCESS; } @@ -186,7 +186,7 @@ TW_UINT16 TWAIN_IdentityGetNext (pTW_IDENTITY pOrigin, TW_MEMREF pData) DSM_twCC = TWCC_SUCCESS; return TWRC_ENDOFLIST; } - memcpy (pSourceIdentity, &devices[DSM_currentDevice++].identity, sizeof(TW_IDENTITY)); + *pSourceIdentity = devices[DSM_currentDevice++].identity; return TWRC_SUCCESS; } @@ -263,7 +263,7 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData) DSM_twCC = TWCC_OPERATIONERROR; return TWRC_FAILURE; } - memcpy (selected, &devices[0].identity, sizeof(TW_IDENTITY)); + *selected = devices[0].identity; DSM_twCC = TWCC_SUCCESS; return TWRC_SUCCESS; }

1 0

Andrew Talbot : urlmon: Assign to structs instead of using memcpy.
by Alexandre Julliard 19 Mar '08

19 Mar '08

Module: wine Branch: master Commit: dbe7718e2b231aed539079b20594094c75461262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe7718e2b231aed539079b20… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 18 21:42:20 2008 +0000 urlmon: Assign to structs instead of using memcpy. --- dlls/urlmon/binding.c | 4 ++-- dlls/urlmon/urlmon_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index c647230..47b521c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1083,7 +1083,7 @@ static HRESULT WINAPI InternetProtocolSink_Switch(IInternetProtocolSink *iface, TRACE("(%p)->(%p)\n", This, pProtocolData); task = heap_alloc(sizeof(switch_task_t)); - memcpy(&task->data, pProtocolData, sizeof(PROTOCOLDATA)); + task->data = *pProtocolData; push_task(This, &task->header, switch_proc); @@ -1382,7 +1382,7 @@ static HRESULT WINAPI InternetBindInfo_GetBindInfo(IInternetBindInfo *iface, *grfBINDF = This->bindf; - memcpy(pbindinfo, &This->bindinfo, sizeof(BINDINFO)); + *pbindinfo = This->bindinfo; if(pbindinfo->szExtraInfo || pbindinfo->szCustomVerb) FIXME("copy strings\n"); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 7d56062..bc3de93 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -398,7 +398,7 @@ HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst) if(!src || !dst) return E_POINTER; - memcpy(dst, src, sizeof(STGMEDIUM)); + *dst = *src; switch(dst->tymed) { case TYMED_NULL:

1 0

Francois Gouget : msi/tests: Skip the tests if we are unable to identify the user SID. This fixes crashes on Win9x.
by Alexandre Julliard 19 Mar '08

19 Mar '08

Module: wine Branch: master Commit: 73f0b3c39bc864554c09a440245a95af835ebe2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f0b3c39bc864554c09a4402… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 18 15:20:58 2008 +0100 msi/tests: Skip the tests if we are unable to identify the user SID. This fixes crashes on Win9x. --- dlls/msi/tests/source.c | 50 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 9 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 49e40c7..5f75159 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -122,18 +122,22 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed) WideCharToMultiByte(CP_ACP, 0, squashedW, -1, squashed, MAX_PATH, NULL, NULL); } -static void get_user_sid(LPSTR *usersid) +static int get_user_sid(LPSTR *usersid) { HANDLE token; BYTE buf[1024]; DWORD size; PTOKEN_USER user; + BOOL rc; - OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + rc=OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + if (!rc && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + return 0; size = sizeof(buf); GetTokenInformation(token, TokenUser, (void *)buf, size, &size); user = (PTOKEN_USER)buf; pConvertSidToStringSidA(user->User.Sid, usersid); + return 1; } static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase, DWORD line) @@ -186,7 +190,11 @@ static void test_MsiSourceListGetInfo(void) } create_test_guid(prodcode, prod_squashed); - get_user_sid(&usersid); + if (!get_user_sid(&usersid)) + { + skip("User SID not available -> skipping MsiSourceListGetInfoA tests\n"); + return; + } /* NULL szProductCodeOrPatchCode */ r = pMsiSourceListGetInfoA(NULL, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, @@ -613,7 +621,11 @@ static void test_MsiSourceListAddSourceEx(void) } create_test_guid(prodcode, prod_squashed); - get_user_sid(&usersid); + if (!get_user_sid(&usersid)) + { + skip("User SID not available -> skipping MsiSourceListAddSourceExA tests\n"); + return; + } /* GetLastError is not set by the function */ @@ -982,7 +994,11 @@ static void test_MsiSourceListEnumSources(void) } create_test_guid(prodcode, prod_squashed); - get_user_sid(&usersid); + if (!get_user_sid(&usersid)) + { + skip("User SID not available -> skipping MsiSourceListEnumSourcesA tests\n"); + return; + } /* GetLastError is not set by the function */ @@ -1580,7 +1596,11 @@ static void test_MsiSourceListSetInfo(void) } create_test_guid(prodcode, prod_squashed); - get_user_sid(&usersid); + if (!get_user_sid(&usersid)) + { + skip("User SID not available -> skipping MsiSourceListSetInfoA tests\n"); + return; + } /* GetLastError is not set by the function */ @@ -1986,7 +2006,11 @@ static void test_MsiSourceListAddMediaDisk(void) } create_test_guid(prodcode, prod_squashed); - get_user_sid(&usersid); + if (!get_user_sid(&usersid)) + { + skip("User SID not available -> skipping MsiSourceListAddMediaDiskA tests\n"); + return; + } /* GetLastError is not set by the function */ @@ -2284,7 +2308,11 @@ static void test_MsiSourceListEnumMediaDisks(void) } create_test_guid(prodcode, prod_squashed); - get_user_sid(&usersid); + if (!get_user_sid(&usersid)) + { + skip("User SID not available -> skipping MsiSourceListEnumMediaDisksA tests\n"); + return; + } /* GetLastError is not set by the function */ @@ -3038,7 +3066,11 @@ static void test_MsiSourceListAddSource(void) } create_test_guid(prodcode, prod_squashed); - get_user_sid(&usersid); + if (!get_user_sid(&usersid)) + { + skip("User SID not available -> skipping MsiSourceListAddSourceA tests\n"); + return; + } /* MACHINENAME\username */ size = MAX_PATH;

1 0