February 2012 - Wine-commits

Vitaliy Margolen : server: Add sessions directory and 0 session symlink.
by Alexandre Julliard 17 Feb '12

17 Feb '12

Module: wine Branch: master Commit: d4e78d61e1dde09c1faa6aa057c1ebdb99de30d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e78d61e1dde09c1faa6aa05… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Feb 17 07:21:45 2012 -0700 server: Add sessions directory and 0 session symlink. --- server/directory.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/server/directory.c b/server/directory.c index f2545ea..112ad12 100644 --- a/server/directory.c +++ b/server/directory.c @@ -370,6 +370,7 @@ void init_directories(void) static const WCHAR dir_named_pipeW[] = {'\\','D','e','v','i','c','e','\\','N','a','m','e','d','P','i','p','e'}; static const WCHAR dir_mailslotW[] = {'\\','D','e','v','i','c','e','\\','M','a','i','l','S','l','o','t'}; static const WCHAR dir_objtypeW[] = {'O','b','j','e','c','t','T','y','p','e','s',}; + static const WCHAR dir_sessionsW[] = {'S','e','s','s','i','o','n','s'}; static const struct unicode_str dir_global_str = {dir_globalW, sizeof(dir_globalW)}; static const struct unicode_str dir_driver_str = {dir_driverW, sizeof(dir_driverW)}; static const struct unicode_str dir_device_str = {dir_deviceW, sizeof(dir_deviceW)}; @@ -377,6 +378,7 @@ void init_directories(void) static const struct unicode_str dir_named_pipe_str = {dir_named_pipeW, sizeof(dir_named_pipeW)}; static const struct unicode_str dir_mailslot_str = {dir_mailslotW, sizeof(dir_mailslotW)}; static const struct unicode_str dir_objtype_str = {dir_objtypeW, sizeof(dir_objtypeW)}; + static const struct unicode_str dir_sessions_str = {dir_sessionsW, sizeof(dir_sessionsW)}; /* symlinks */ static const WCHAR link_dosdevW[] = {'D','o','s','D','e','v','i','c','e','s'}; @@ -384,11 +386,17 @@ void init_directories(void) static const WCHAR link_localW[] = {'L','o','c','a','l'}; static const WCHAR link_pipeW[] = {'P','I','P','E'}; static const WCHAR link_mailslotW[] = {'M','A','I','L','S','L','O','T'}; + static const WCHAR link_0W[] = {'0'}; + static const WCHAR link_sessionW[] = {'S','e','s','s','i','o','n'}; + static const WCHAR link_sessionsW[] = {'\\','S','e','s','s','i','o','n','s'}; static const struct unicode_str link_dosdev_str = {link_dosdevW, sizeof(link_dosdevW)}; static const struct unicode_str link_global_str = {link_globalW, sizeof(link_globalW)}; static const struct unicode_str link_local_str = {link_localW, sizeof(link_localW)}; static const struct unicode_str link_pipe_str = {link_pipeW, sizeof(link_pipeW)}; static const struct unicode_str link_mailslot_str = {link_mailslotW, sizeof(link_mailslotW)}; + static const struct unicode_str link_0_str = {link_0W, sizeof(link_0W)}; + static const struct unicode_str link_session_str = {link_sessionW, sizeof(link_sessionW)}; + static const struct unicode_str link_sessions_str = {link_sessionsW, sizeof(link_sessionsW)}; /* devices */ static const WCHAR named_pipeW[] = {'N','a','m','e','d','P','i','p','e'}; @@ -396,16 +404,18 @@ void init_directories(void) static const struct unicode_str named_pipe_str = {named_pipeW, sizeof(named_pipeW)}; static const struct unicode_str mailslot_str = {mailslotW, sizeof(mailslotW)}; - struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed; - struct symlink *link_dosdev, *link_global1, *link_global2, *link_local, *link_pipe, *link_mailslot; + struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed, *dir_sessions; + struct symlink *link_dosdev, *link_global1, *link_global2, *link_local, *link_pipe, *link_mailslot, *link_0, *link_session; root_directory = create_directory( NULL, NULL, 0, HASH_SIZE ); dir_driver = create_directory( root_directory, &dir_driver_str, 0, HASH_SIZE ); dir_device = create_directory( root_directory, &dir_device_str, 0, HASH_SIZE ); dir_objtype = create_directory( root_directory, &dir_objtype_str, 0, HASH_SIZE ); + dir_sessions = create_directory( root_directory, &dir_sessions_str, 0, HASH_SIZE ); make_object_static( &root_directory->obj ); make_object_static( &dir_driver->obj ); make_object_static( &dir_objtype->obj ); + make_object_static( &dir_sessions->obj ); dir_global = create_directory( NULL, &dir_global_str, 0, HASH_SIZE ); /* use a larger hash table for this one since it can contain a lot of objects */ @@ -422,12 +432,16 @@ void init_directories(void) link_local = create_symlink( dir_basenamed, &link_local_str, 0, &dir_basenamed_str ); link_pipe = create_symlink( dir_global, &link_pipe_str, 0, &dir_named_pipe_str ); link_mailslot = create_symlink( dir_global, &link_mailslot_str, 0, &dir_mailslot_str ); + link_0 = create_symlink( dir_sessions, &link_0_str, 0, &dir_basenamed_str ); + link_session = create_symlink( dir_basenamed, &link_session_str, 0, &link_sessions_str ); make_object_static( (struct object *)link_dosdev ); make_object_static( (struct object *)link_global1 ); make_object_static( (struct object *)link_global2 ); make_object_static( (struct object *)link_local ); make_object_static( (struct object *)link_pipe ); make_object_static( (struct object *)link_mailslot ); + make_object_static( (struct object *)link_0 ); + make_object_static( (struct object *)link_session ); /* the symlinks or devices hold references so we can release these */ release_object( dir_global );

1 0

Gustavo Henrique Milaré : cryptui: Adjust the size of "Add &Purpose..." button.
by Alexandre Julliard 17 Feb '12

17 Feb '12

Module: wine Branch: master Commit: 85918e7f0a4c68168c2c8663bcef2b2a30ee3b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85918e7f0a4c68168c2c8663b… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Feb 16 22:21:24 2012 -0200 cryptui: Adjust the size of "Add &Purpose..." button. --- dlls/cryptui/cryptui.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui.rc b/dlls/cryptui/cryptui.rc index ce1aa95..57b1627 100644 --- a/dlls/cryptui/cryptui.rc +++ b/dlls/cryptui/cryptui.rc @@ -247,7 +247,7 @@ BEGIN CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 24,100,220,106 - PUSHBUTTON "Add &Purpose...", IDC_ADD_PURPOSE,174,212,70,14 + PUSHBUTTON "Add &Purpose...", IDC_ADD_PURPOSE,168,212,76,14 END IDD_ADD_CERT_PURPOSE DIALOG 0,0,200,68

1 0

Christian Costa : d3dxof: Decompress all MSZIP chunks of the compressed file and update file format description .
by Alexandre Julliard 17 Feb '12

17 Feb '12

Module: wine Branch: master Commit: 46d4bec269203be8f88cb791f8feb39f86c1014b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46d4bec269203be8f88cb791f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Feb 17 00:19:12 2012 +0100 d3dxof: Decompress all MSZIP chunks of the compressed file and update file format description. --- dlls/d3dxof/parsing.c | 60 ++++++++++++++++++++++++++++++------------- dlls/d3dxof/tests/d3dxof.c | 9 +++--- 2 files changed, 47 insertions(+), 22 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 4b9b12f..a6e387d 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -220,40 +220,64 @@ HRESULT parse_header(parse_buffer * buf, BYTE ** decomp_buffer_ptr) if (header[2] == XOFFILE_FORMAT_BINARY_MSZIP || header[2] == XOFFILE_FORMAT_TEXT_MSZIP) { /* Extended header for compressed data: - * 16-17 -> decompressed size w/ header, 18-19 -> null, - * 20-21 -> decompressed size w/o header, 22-23 -> size of MSZIP compressed data, - * 24-xx -> compressed MSZIP data */ + * 16-19 -> size of decompressed file including xof header, + * 20-21 -> size of first decompressed MSZIP chunk, 22-23 -> size of first compressed MSZIP chunk + * 24-xx -> compressed MSZIP data chunk + * xx-xx -> size of next decompressed MSZIP chunk, xx-xx -> size of next compressed MSZIP chunk + * xx-xx -> compressed MSZIP data chunk + * .............................................................................................. */ int err; - WORD decomp_size; - WORD comp_size; + DWORD decomp_file_size; + WORD decomp_chunk_size; + WORD comp_chunk_size; LPBYTE decomp_buffer; - buf->rem_bytes -= sizeof(WORD) * 2; - buf->buffer += sizeof(WORD) * 2; - if (!read_bytes(buf, &decomp_size, sizeof(decomp_size))) - return DXFILEERR_BADFILETYPE; - if (!read_bytes(buf, &comp_size, sizeof(comp_size))) + if (!read_bytes(buf, &decomp_file_size, sizeof(decomp_file_size))) return DXFILEERR_BADFILETYPE; - TRACE("Compressed format %s detected: compressed_size = %x, decompressed_size = %x\n", - debugstr_fourcc(header[2]), comp_size, decomp_size); + TRACE("Compressed format %s detected: decompressed file size with xof header = %d\n", + debugstr_fourcc(header[2]), decomp_file_size); + + /* Does not take xof header into account */ + decomp_file_size -= 16; - decomp_buffer = HeapAlloc(GetProcessHeap(), 0, decomp_size); + decomp_buffer = HeapAlloc(GetProcessHeap(), 0, decomp_file_size); if (!decomp_buffer) { ERR("Out of memory\n"); return DXFILEERR_BADALLOC; } - err = mszip_decompress(comp_size, decomp_size, (char*)buf->buffer, (char*)decomp_buffer); - if (err) + *decomp_buffer_ptr = decomp_buffer; + + while (buf->rem_bytes) { - WARN("Error while decompressing mszip archive %d\n", err); + if (!read_bytes(buf, &decomp_chunk_size, sizeof(decomp_chunk_size))) + return DXFILEERR_BADFILETYPE; + if (!read_bytes(buf, &comp_chunk_size, sizeof(comp_chunk_size))) + return DXFILEERR_BADFILETYPE; + + TRACE("Process chunk: compressed_size = %d, decompressed_size = %d\n", + comp_chunk_size, decomp_chunk_size); + + err = mszip_decompress(comp_chunk_size, decomp_chunk_size, (char*)buf->buffer, (char*)decomp_buffer); + if (err) + { + WARN("Error while decompressing MSZIP chunk %d\n", err); HeapFree(GetProcessHeap(), 0, decomp_buffer); return DXFILEERR_BADALLOC; + } + buf->rem_bytes -= comp_chunk_size; + buf->buffer += comp_chunk_size; + decomp_buffer += decomp_chunk_size; } + + if ((decomp_buffer - *decomp_buffer_ptr) != decomp_file_size) + ERR("Size of all decompressed chunks (%u) does not match decompressed file size (%u)\n", + (DWORD)(decomp_buffer - *decomp_buffer_ptr), decomp_file_size); + /* Use decompressed data */ - buf->buffer = *decomp_buffer_ptr = decomp_buffer; - buf->rem_bytes = decomp_size; + buf->buffer = *decomp_buffer_ptr; + buf->rem_bytes = decomp_file_size; } TRACE("Header is correct\n"); diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 8ce22b7..5c6315a 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -74,11 +74,12 @@ static char empty_bin_file[] = "xof 0302bin 0064"; /* MSZip data is generated with the command "MAKECAB.EXE /D Compress=ON /D CompressionType=MSZip file packed" * Data in cab is after the filename (null terminated) and the 32-bit checksum: * size (16-bit), packed_size (16-bit) and compressed data (with leading 16-bit CK signature) - * Data in x files is preceding by 2 16-bit words: size with xof header (16 bytes) and a 0 value - * It does not seem possible to generate a MSZip data with no byte, so put just 1 byte here */ -/* "\n" packed with MSZip => not text */ + * for each MSZIP chunk whose decompressed size can not exceed 32768 bytes + * Data in x files is preceeding by the size (32-bit) of the decompressed file including the xof header (16 bytes) + * It does not seem possible to generate a MSZip data chunk with no byte, so put just 1 byte here */ +/* "\n" packed with MSZip => no text */ static char empty_tzip_file[] = "xof 0302tzip0064\x11\x00\x00\x00\x01\x00\x05\x00\x43\x4b\xe3\x02\x00"; -/* "\n" packed with MSZip => not token (token are 16-bit and there is only 1 byte) */ +/* "\n" packed with MSZip => no token (token are 16-bit and there is only 1 byte) */ static char empty_bzip_file[] = "xof 0302bzip0064\x11\x00\x00\x00\x01\x00\x05\x00\x43\x4b\xe3\x02\x00"; static char empty_cmp_file[] = "xof 0302cmp 0064"; static char empty_xxxx_file[] = "xof 0302xxxx0064";

1 0

Christian Costa : d3dxof: Increase limit of number of children.
by Alexandre Julliard 17 Feb '12

17 Feb '12

Module: wine Branch: master Commit: a91097ed33fb2a630fe3e3f234b21155b3fff2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91097ed33fb2a630fe3e3f23… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Feb 17 09:38:55 2012 +0100 d3dxof: Increase limit of number of children. --- dlls/d3dxof/d3dxof_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index bc32d1f..a68df56 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -33,7 +33,7 @@ #define MAX_NAME_LEN 32 #define MAX_ARRAY_DIM 4 #define MAX_MEMBERS 50 -#define MAX_CHILDREN 100 +#define MAX_CHILDREN 200 #define MAX_TEMPLATES 200 #define MAX_OBJECTS 500 #define MAX_SUBOBJECTS 2000

1 0

Huw Davies : oleaut32: Zero-init [out] only parameters.
by Alexandre Julliard 17 Feb '12

17 Feb '12

Module: wine Branch: master Commit: be4d45cacb119f7f84bc6f82dceced703b42d79d URL: http://source.winehq.org/git/wine.git/?a=commit;h=be4d45cacb119f7f84bc6f82d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 17 13:02:17 2012 +0000 oleaut32: Zero-init [out] only parameters. --- dlls/oleaut32/tests/tmarshal.c | 2 +- dlls/oleaut32/tmarshal.c | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index b491e53..cb626d3 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1118,7 +1118,7 @@ static void test_typelibmarshal(void) VariantClear(&varresult); /* call get_Name (direct) */ - bstr = NULL; + bstr = (void *)0xdeadbeef; hr = IWidget_get_Name(pWidget, &bstr); ok_ole_success(hr, IWidget_get_Name); ok(!lstrcmpW(bstr, szCat), "IWidget_get_Name should have returned string \"Cat\" instead of %s\n", wine_dbgstr_w(bstr)); diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 44a6d44..b69634f 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -723,7 +723,7 @@ serialize_param( return S_OK; } case VT_BSTR: { - if (debugout) { + if (writeit && debugout) { if (*arg) TRACE_(olerelay)("%s",relaystr((WCHAR*)*arg)); else @@ -1402,11 +1402,20 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) TRACE_(olerelay)("%s=",relaystr(names[i+1])); } /* No need to marshal other data than FIN and any VT_PTR. */ - if (!is_in_elem(elem) && (elem->tdesc.vt != VT_PTR)) { - xargs+=_argsize(&elem->tdesc, tinfo); - if (relaydeb) TRACE_(olerelay)("[out]"); - continue; - } + if (!is_in_elem(elem)) + { + if (elem->tdesc.vt != VT_PTR) + { + xargs+=_argsize(&elem->tdesc, tinfo); + if (relaydeb) TRACE_(olerelay)("[out]"); + continue; + } + else + { + memset( *(void **)xargs, 0, _xsize( elem->tdesc.u.lptdesc, tinfo ) ); + } + } + hres = serialize_param( tinfo, is_in_elem(elem),

1 0

Jörg Höhle : mciwave: Zero closed resource pointer to prevent reuse.
by Alexandre Julliard 17 Feb '12

17 Feb '12

Module: wine Branch: master Commit: c3a4942b50b3175b3012e62c909c085661de19f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a4942b50b3175b3012e62c9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Feb 16 07:31:40 2012 +0100 mciwave: Zero closed resource pointer to prevent reuse. --- dlls/mciwave/mciwave.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 723b5fe..4f24169 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -870,6 +870,10 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, whidx = 0; wmw->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!wmw->hEvent) { + dwRet = MCIERR_OUT_OF_MEMORY; + goto cleanUp; + } wmw->dwEventCount = 1L; /* for first buffer */ TRACE("Playing (normalized) from byte=%u for %u bytes\n", wmw->dwPosition, left); @@ -921,6 +925,7 @@ cleanUp: wmw->hWave = 0; } CloseHandle(wmw->hEvent); + wmw->hEvent = NULL; wmw->dwStatus = MCI_MODE_STOP;

1 0

Francois Gouget : po: Fix some typography issues in the Dutch translation.
by Alexandre Julliard 17 Feb '12

17 Feb '12

Module: wine Branch: master Commit: 234f331dc898b065a78a3d1cf18bf7f040310406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=234f331dc898b065a78a3d1cf… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 16 23:30:39 2012 +0100 po: Fix some typography issues in the Dutch translation. --- po/nl.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/po/nl.po b/po/nl.po index f40ba99..def27c3 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2015,7 +2015,7 @@ msgstr "Certificaatbeleid" #: cryptdlg.rc:28 msgid "Policy Identifier: " -msgstr "Autoriteits Sleutel Identificatie nummer:" +msgstr "Autoriteits Sleutel Identificatie nummer: " #: cryptdlg.rc:29 msgid "Policy Qualifier Info" @@ -2312,6 +2312,7 @@ msgstr "" "authenticatie en om berichten te ondertekenen. Een certificaatkluis bevat " "een verzameling van certificaten, lijsten van herroepen certificaten en " "lijsten van vertrouwde certificaten.\n" +"\n" "Klik Volgende om verder te gaan." #: cryptui.rc:381 @@ -8388,9 +8389,8 @@ msgid "The specified device handle is invalid." msgstr "De gespecificeerde apparaatverwijzing is ongeldig." #: winmm.rc:34 -#, fuzzy msgid "There is no driver installed on your system!" -msgstr "Er is geen driver geïnstalleerd op uw systeem !\n" +msgstr "Er is geen driver geïnstalleerd op uw systeem!" #: winmm.rc:35 winmm.rc:61 msgid "" @@ -9235,7 +9235,7 @@ msgstr "" #: attrib.rc:28 cmd.rc:318 msgid "%1: File Not Found\n" -msgstr "%1 : Bestand niet gevonden\n" +msgstr "%1: Bestand niet gevonden\n" #: attrib.rc:47 msgid "" @@ -9460,9 +9460,9 @@ msgid "" msgstr "" "IF wordt gebruikt om een opdracht voorwaardelijk uit te voeren.\n" "\n" -"Syntax:\tIF [NOT] EXIST bestandsnaam opdracht\n" -"IF [NOT] tekenreeks1==tekenreeks2 opdracht\n" -"IF [NOT] ERRORLEVEL getal opdracht\n" +"Syntax: IF [NOT] EXIST bestandsnaam opdracht\n" +" IF [NOT] tekenreeks1==tekenreeks2 opdracht\n" +" IF [NOT] ERRORLEVEL getal opdracht\n" "\n" "In de tweede vorm van de opdracht moeten tekenreeks1 en tekenreeks2 tussen\n" "dubbele aanhalingstekens staan. De vergelijking is niet gevoelig voor het\n" @@ -9543,7 +9543,8 @@ msgstr "" "toets in te drukken.\n" "\n" "Dit is vooral handig in batchbestanden om de gebruiker in staat te stellen " -"om de uitvoer van een voorafgaande opdracht te bekijken, voordat het van het " +"om\n" +"de uitvoer van een voorafgaande opdracht te bekijken, voordat het van het\n" "scherm schuift.\n" #: cmd.rc:149 @@ -9761,7 +9762,7 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file\n" "which were introduced by a preceding SETLOCAL.\n" msgstr "" -"ENDLOCAL beëindigt de localisatie van omgevingswijzigingen in een " +"ENDLOCAL beëindigt de localisatie van omgevingswijzigingen in een\n" "batchbestand die werd begonnen door een voorafgaande SETLOCAL opdracht.\n" #: cmd.rc:233 @@ -9845,8 +9846,7 @@ msgstr "" #: cmd.rc:259 msgid "MORE displays output of files or piped input in pages.\n" msgstr "" -"MORE toont de uitvoer van programma's of herleidde invoer\n" -"per bladzijde.\n" +"MORE toont de uitvoer van programma's of herleidde invoer per bladzijde.\n" #: cmd.rc:263 msgid "" @@ -12937,7 +12937,7 @@ msgstr "Standaardinstellingen" #: winecfg.rc:59 msgid "Wine Programs (*.exe; *.exe.so)" -msgstr "Wine toepassingen (*.exe, *.exe.so)" +msgstr "Wine toepassingen (*.exe; *.exe.so)" #: winecfg.rc:60 msgid "Use global settings" @@ -13348,9 +13348,9 @@ msgid "" msgstr "" " --backend={user|curses} Kiezen voor user zal een nieuw window doen " "verschijnen,\n" -" curses zal proberen de huidige terminal om te " +" curses zal proberen de huidige terminal om te " "zetten\n" -" in een Wine console.\n" +" in een Wine console.\n" #: wineconsole.rc:50 msgid " <command> The Wine program to launch in the console.\n"

1 0

Francois Gouget : po: Remove some invalid shell folder path translations from the Dutch translation .
by Alexandre Julliard 17 Feb '12

17 Feb '12

Module: wine Branch: master Commit: d2f49c331997204c9085e3170b2212b56debc738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f49c331997204c9085e3170… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 17 08:33:02 2012 +0100 po: Remove some invalid shell folder path translations from the Dutch translation. --- po/nl.po | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/po/nl.po b/po/nl.po index def27c3..12f0073 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7942,19 +7942,22 @@ msgstr "Documenten" #: shell32.rc:217 #, fuzzy msgid "Administrative Tools" -msgstr "Start Menu\\Programma's\\Administratieve Tools" +msgstr "Administratieve Tools" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Documenten\\Mijn Muziek" +msgstr "Mijn Muziek" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Documenten\\Mijn Afbeeldingen" +msgstr "Mijn Afbeeldingen" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Documenten\\Mijn Videos" +msgstr "Mijn Videos" #: shell32.rc:213 msgid "Program Files (x86)" @@ -7971,12 +7974,12 @@ msgstr "Links" #: shell32.rc:223 #, fuzzy msgid "Slide Shows" -msgstr "Afbeeldingen\\Diashows" +msgstr "Diashows" #: shell32.rc:224 #, fuzzy msgid "Playlists" -msgstr "Muziek\\Afspeellijsten" +msgstr "Afspeellijsten" #: shell32.rc:148 taskmgr.rc:326 msgid "Status" @@ -7993,22 +7996,22 @@ msgstr "Model" #: shell32.rc:225 #, fuzzy msgid "Sample Music" -msgstr "Muziek\\Voorbeelden van muziek" +msgstr "Voorbeelden van muziek" #: shell32.rc:226 #, fuzzy msgid "Sample Pictures" -msgstr "Afbeeldingen\\Voorbeelden van afbeeldingen" +msgstr "Voorbeelden van afbeeldingen" #: shell32.rc:227 #, fuzzy msgid "Sample Playlists" -msgstr "Muziek\\Voorbeelden van afspeellijsten" +msgstr "Voorbeelden van afspeellijsten" #: shell32.rc:228 #, fuzzy msgid "Sample Videos" -msgstr "Video's\\Voorbeelden van video's" +msgstr "Voorbeelden van video's" #: shell32.rc:229 msgid "Saved Games"

1 0

Jörg Höhle : winmm: Avoid using SuspendThread, it can hang Wine.
by Alexandre Julliard 17 Feb '12

17 Feb '12

Module: wine Branch: master Commit: 1b1157600539b1d0e263f707b34b3c4d7e58d99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1157600539b1d0e263f707b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Feb 6 18:13:16 2012 +0100 winmm: Avoid using SuspendThread, it can hang Wine. --- dlls/winmm/winmm.c | 215 ++++++++++++++++++++++++--------------------------- 1 files changed, 101 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b1157600539b1d0e263f…

1 0

Jörg Höhle : winmm: Make midiStream* messages asynchronous to avoid deadlocks.
by Alexandre Julliard 17 Feb '12

17 Feb '12

Module: wine Branch: master Commit: 21e47e905e2d1f1206344a83e303610d4992be05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e47e905e2d1f1206344a83e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 7 23:10:03 2012 +0100 winmm: Make midiStream* messages asynchronous to avoid deadlocks. --- dlls/winmm/winmm.c | 46 ++++++++++++++++++++-------------------------- 1 files changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index cb6292a..714a84e 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1013,14 +1013,15 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI for (;;) { switch (msg->message) { case WM_QUIT: - SetEvent(lpMidiStrm->hEvent); return FALSE; case WINE_MSM_STOP: TRACE("STOP\n"); /* this is not quite what MS doc says... */ midiOutReset(lpMidiStrm->hDevice); /* empty list of already submitted buffers */ - for (lpMidiHdr = lpMidiStrm->lpMidiHdr; lpMidiHdr; ) { + lpMidiHdr = lpMidiStrm->lpMidiHdr; + lpMidiStrm->lpMidiHdr = NULL; + while (lpMidiHdr) { LPMIDIHDR lphdr = lpMidiHdr; lpMidiHdr = lpMidiHdr->lpNext; lphdr->dwFlags |= MHDR_DONE; @@ -1030,18 +1031,14 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI (HDRVR)lpMidiStrm->hDevice, MM_MOM_DONE, lpwm->mod.dwInstance, (DWORD_PTR)lphdr, 0); } - lpMidiStrm->lpMidiHdr = 0; - SetEvent(lpMidiStrm->hEvent); return TRUE; case WINE_MSM_RESUME: /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ lpMidiStrm->dwStartTicks = GetTickCount() - lpMidiStrm->dwPositionMS; - SetEvent(lpMidiStrm->hEvent); return TRUE; case WINE_MSM_PAUSE: /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ paused = TRUE; - SetEvent(lpMidiStrm->hEvent); break; /* FIXME(EPP): "I don't understand the content of the first MIDIHDR sent * by native mcimidi, it doesn't look like a correct one". @@ -1248,25 +1245,12 @@ the_end: } /************************************************************************** - * MMSYSTEM_MidiStream_PostMessage [internal] - */ -static BOOL MMSYSTEM_MidiStream_PostMessage(WINE_MIDIStream* lpMidiStrm, WORD msg, DWORD pmt1, DWORD pmt2) -{ - if (PostThreadMessageA(lpMidiStrm->dwThreadID, msg, pmt1, pmt2)) { - MsgWaitForMultipleObjects( 1, &lpMidiStrm->hEvent, FALSE, INFINITE, 0 ); - } else { - ERR("bad PostThreadMessageA\n"); - return FALSE; - } - return TRUE; -} - -/************************************************************************** * midiStreamClose [WINMM.@] */ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) { WINE_MIDIStream* lpMidiStrm; + MMRESULT ret = 0; TRACE("(%p)!\n", hMidiStrm); @@ -1274,9 +1258,19 @@ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) return MMSYSERR_INVALHANDLE; midiStreamStop(hMidiStrm); - MMSYSTEM_MidiStream_PostMessage(lpMidiStrm, WM_QUIT, 0, 0); + PostThreadMessageA(lpMidiStrm->dwThreadID, WM_QUIT, 0, 0); CloseHandle(lpMidiStrm->hEvent); - HeapFree(GetProcessHeap(), 0, lpMidiStrm); + if (lpMidiStrm->hThread) { + if (GetCurrentThreadId() != lpMidiStrm->dwThreadID) + WaitForSingleObject(lpMidiStrm->hThread, INFINITE); + else { + FIXME("leak from call within function callback\n"); + ret = MMSYSERR_HANDLEBUSY; /* yet don't signal it to app */ + } + CloseHandle(lpMidiStrm->hThread); + } + if(!ret) + HeapFree(GetProcessHeap(), 0, lpMidiStrm); return midiOutClose((HMIDIOUT)hMidiStrm); } @@ -1347,7 +1341,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, /* wait for thread to have started, and for its queue to be created */ WaitForSingleObject(lpMidiStrm->hEvent, INFINITE); - MMSYSTEM_MidiStream_PostMessage(lpMidiStrm, WINE_MSM_PAUSE, 0, 0); + PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_PAUSE, 0, 0); TRACE("=> (%u/%d) hMidi=%p ret=%d lpMidiStrm=%p\n", *lpuDeviceID, lpwm->mld.uDeviceID, *lphMidiStrm, ret, lpMidiStrm); @@ -1405,7 +1399,7 @@ MMRESULT WINAPI midiStreamPause(HMIDISTRM hMidiStrm) if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) return MMSYSERR_INVALHANDLE; - MMSYSTEM_MidiStream_PostMessage(lpMidiStrm, WINE_MSM_PAUSE, 0, 0); + PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_PAUSE, 0, 0); return ret; } @@ -1501,7 +1495,7 @@ MMRESULT WINAPI midiStreamRestart(HMIDISTRM hMidiStrm) if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) return MMSYSERR_INVALHANDLE; - MMSYSTEM_MidiStream_PostMessage(lpMidiStrm, WINE_MSM_RESUME, 0, 0); + PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_RESUME, 0, 0); return ret; } @@ -1517,7 +1511,7 @@ MMRESULT WINAPI midiStreamStop(HMIDISTRM hMidiStrm) if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) return MMSYSERR_INVALHANDLE; - MMSYSTEM_MidiStream_PostMessage(lpMidiStrm, WINE_MSM_STOP, 0, 0); + PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_STOP, 0, 0); return ret; }

1 0