February 2012 - Wine-Commits

Maarten Lankhorst : mmdevapi: Fix exclusive test.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 14b765aca538a43b57a989b28acc1656928113c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b765aca538a43b57a989b28… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 19 13:18:28 2012 +0100 mmdevapi: Fix exclusive test. --- dlls/mmdevapi/tests/render.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index e2b281e..127f558 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -878,6 +878,7 @@ static void test_clock(int share) period = defp; } else { pwfx->wFormatTag = WAVE_FORMAT_PCM; + pwfx->nChannels = 2; pwfx->cbSize = 0; pwfx->wBitsPerSample = 16; /* no floating point */ pwfx->nBlockAlign = pwfx->nChannels * pwfx->wBitsPerSample / 8;

1 0

Dmitry Timoshkov : kernel32: Add a test to show that NtMapViewOfSection should not perform an image relocation .
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 20093556f92fbced66761526b8801bcd94ec484d URL: http://source.winehq.org/git/wine.git/?a=commit;h=20093556f92fbced66761526b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 20 16:01:25 2012 +0800 kernel32: Add a test to show that NtMapViewOfSection should not perform an image relocation. --- dlls/kernel32/tests/loader.c | 127 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 124 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 0b67bb6..9c969c2 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -21,12 +21,18 @@ #include <stdarg.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/test.h" #define ALIGN_SIZE(size, alignment) (((size) + (alignment - 1)) & ~((alignment - 1))) +static NTSTATUS (WINAPI *pNtMapViewOfSection)(HANDLE, HANDLE, PVOID *, ULONG, SIZE_T, const LARGE_INTEGER *, SIZE_T *, ULONG, ULONG, ULONG); +static NTSTATUS (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); + static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { if (rva == 0) @@ -553,6 +559,105 @@ static void test_ImportDescriptors(void) } } +static void test_image_mapping(const char *dll_name, DWORD scn_page_access) +{ + HANDLE hfile, hmap; + NTSTATUS status; + LARGE_INTEGER offset; + SIZE_T size; + void *addr1, *addr2; + MEMORY_BASIC_INFORMATION info; + SYSTEM_INFO si; + + if (!pNtMapViewOfSection) return; + + GetSystemInfo(&si); + + SetLastError(0xdeadbeef); + hfile = CreateFile(dll_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + hmap = CreateFileMapping(hfile, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, 0); + ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + + offset.u.LowPart = 0; + offset.u.HighPart = 0; + + addr1 = NULL; + size = 0; + status = pNtMapViewOfSection(hmap, GetCurrentProcess(), &addr1, 0, 0, &offset, + &size, 1 /* ViewShare */, 0, PAGE_READONLY); + ok(status == STATUS_SUCCESS, "NtMapViewOfSection error %x\n", status); + ok(addr1 != 0, "mapped address should be valid\n"); + + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)addr1 + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == (char *)addr1 + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)addr1 + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "got %#lx != expected %#x\n", info.RegionSize, si.dwPageSize); + ok(info.Protect == scn_page_access, "got %#x != expected %#x\n", info.Protect, scn_page_access); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%#x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == SEC_IMAGE, "%#x != SEC_IMAGE\n", info.Type); + + addr2 = NULL; + size = 0; + status = pNtMapViewOfSection(hmap, GetCurrentProcess(), &addr2, 0, 0, &offset, + &size, 1 /* ViewShare */, 0, PAGE_READONLY); + /* FIXME: remove once Wine is fixed */ + if (status != STATUS_IMAGE_NOT_AT_BASE) + { + todo_wine { + ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); + ok(addr2 != 0, "mapped address should be valid\n"); + } + goto wine_is_broken; + } + ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); + ok(addr2 != 0, "mapped address should be valid\n"); + + ok(addr2 != addr1, "mapped addresses should be different\n"); + + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)addr2 + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == (char *)addr2 + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)addr2 + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "got %#lx != expected %#x\n", info.RegionSize, si.dwPageSize); + ok(info.Protect == scn_page_access, "got %#x != expected %#x\n", info.Protect, scn_page_access); + ok(info.AllocationBase == addr2, "%p != %p\n", info.AllocationBase, addr2); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%#x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == SEC_IMAGE, "%#x != SEC_IMAGE\n", info.Type); + + status = pNtUnmapViewOfSection(GetCurrentProcess(), addr2); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); + + addr2 = MapViewOfFile(hmap, 0, 0, 0, 0); + ok(addr2 != addr1, "mapped addresses should be different\n"); + + SetLastError(0xdeadbeef); + size = VirtualQuery((char *)addr2 + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == (char *)addr2 + section.VirtualAddress, "got %p != expected %p\n", info.BaseAddress, (char *)addr2 + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "got %#lx != expected %#x\n", info.RegionSize, si.dwPageSize); + ok(info.Protect == scn_page_access, "got %#x != expected %#x\n", info.Protect, scn_page_access); + ok(info.AllocationBase == addr2, "%p != %p\n", info.AllocationBase, addr2); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%#x != PAGE_EXECUTE_WRITECOPY\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == SEC_IMAGE, "%#x != SEC_IMAGE\n", info.Type); + + UnmapViewOfFile(addr2); + +wine_is_broken: + status = pNtUnmapViewOfSection(GetCurrentProcess(), addr1); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); + + CloseHandle(hmap); + CloseHandle(hfile); +} + static BOOL is_mem_writable(DWORD prot) { switch (prot & 0xff) @@ -776,9 +881,7 @@ static void test_section_access(void) nt_header.FileHeader.NumberOfSections = 1; nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); - - /* don't set IMAGE_FILE_DLL to show that it doesn't change anything for a DLL or a process image */ - nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE; + nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_DLL | IMAGE_FILE_RELOCS_STRIPPED; nt_header.OptionalHeader.SectionAlignment = si.dwPageSize; nt_header.OptionalHeader.FileAlignment = 0x200; @@ -852,6 +955,19 @@ static void test_section_access(void) ret = FreeLibrary(hlib); ok(ret, "FreeLibrary error %d\n", GetLastError()); + test_image_mapping(dll_name, td[i].scn_page_access); + + /* reset IMAGE_FILE_DLL otherwise CreateProcess fails */ + nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_RELOCS_STRIPPED; + SetLastError(0xdeadbeef); + hfile = CreateFile(dll_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok (hfile != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + SetFilePointer(hfile, sizeof(dos_header), NULL, FILE_BEGIN); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &nt_header, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + CloseHandle(hfile); + memset(&sti, 0, sizeof(sti)); sti.cb = sizeof(sti); SetLastError(0xdeadbeef); @@ -886,6 +1002,8 @@ static void test_section_access(void) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); + test_image_mapping(dll_name, td[i].scn_page_access); + SetLastError(0xdeadbeef); ret = DeleteFile(dll_name); ok(ret, "DeleteFile error %d\n", GetLastError()); @@ -894,6 +1012,9 @@ static void test_section_access(void) START_TEST(loader) { + pNtMapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtMapViewOfSection"); + pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtUnmapViewOfSection"); + test_Loader(); test_ImportDescriptors(); test_section_access();

1 0

Marcus Meissner : quartz: Fixed sizeof()s to IsBadReadPtr (Coverity).
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 90dd4ea9a66816a651683f13b576eb77ab42682b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90dd4ea9a66816a651683f13b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 18 16:12:12 2012 +0100 quartz: Fixed sizeof()s to IsBadReadPtr (Coverity). --- dlls/quartz/tests/filtermapper.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 2209af4..68918f2 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -517,8 +517,8 @@ static void test_parse_filter_data(void) pRegFilter =((REGFILTER2**)prgbRegFilter2)[0]; ok (hr==S_OK,"Failed to Parse filter Data\n"); - ok(IsBadReadPtr(prgbRegFilter2,sizeof(REGFILTER2**))==0,"Bad read pointer returned\n"); - ok(IsBadReadPtr(pRegFilter,sizeof(REGFILTER2*))==0,"Bad read pointer for FilterData\n"); + ok(IsBadReadPtr(prgbRegFilter2,sizeof(REGFILTER2*))==0,"Bad read pointer returned\n"); + ok(IsBadReadPtr(pRegFilter,sizeof(REGFILTER2))==0,"Bad read pointer for FilterData\n"); ok(pRegFilter->dwMerit == 0x5fffff,"Incorrect merit returned\n"); out:

1 0

Frédéric Delanoy : comctl32/tests: Use initialized window handle when rebuilding toolbar (Coverity).
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 3c13f991e43215ba08badce5a5bba99c93ed102a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c13f991e43215ba08badce5a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 18 13:46:08 2012 +0100 comctl32/tests: Use initialized window handle when rebuilding toolbar (Coverity). --- dlls/comctl32/tests/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 474e5ef..2444975 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1881,7 +1881,7 @@ static void test_TB_GET_SET_EXTENDEDSTYLE(void) { DWORD style, oldstyle, oldstyle2; const extended_style_t *ptr; - HWND hwnd; + HWND hwnd = NULL; int i; rebuild_toolbar(&hwnd);

1 0

Nikolay Sivov : wpp: Properly use va_start/va_end around vsnprintf().
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: fdcf7cc9afa99ba120298dafaa5b5907ee781fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdcf7cc9afa99ba120298dafa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 18 14:06:36 2012 +0300 wpp: Properly use va_start/va_end around vsnprintf(). --- libs/wpp/ppl.l | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 98f3e1a..2718fd0 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -329,6 +329,7 @@ void pp_writestring(const char *format, ...) va_start(valist, format); len = vsnprintf(buffer, buffercapacity, format, valist); + va_end(valist); /* If the string is longer than buffersize, vsnprintf returns * the string length with glibc >= 2.1, -1 with glibc < 2.1 */ while(len > buffercapacity || len < 0) @@ -345,10 +346,11 @@ void pp_writestring(const char *format, ...) return; } buffer = new_buffer; + va_start(valist, format); len = vsnprintf(buffer, buffercapacity, format, valist); + va_end(valist); } - va_end(valist); wpp_callbacks->write(buffer, len); }

1 0

Eric Pouech : kernel32: Enhance bare fd check by checking that the handle is a real console handle .
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 945e16c281fc8bc3d6ead7ba95b34b24af39d1d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=945e16c281fc8bc3d6ead7ba9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Feb 17 21:57:38 2012 +0100 kernel32: Enhance bare fd check by checking that the handle is a real console handle. --- dlls/kernel32/console.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 6d429f0..4410a31 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -160,7 +160,8 @@ static int get_console_bare_fd(HANDLE hin) { int fd; - if (wine_server_handle_to_fd(wine_server_ptr_handle(console_handle_unmap(hin)), + if (is_console_handle(hin) && + wine_server_handle_to_fd(wine_server_ptr_handle(console_handle_unmap(hin)), 0, &fd, NULL) == STATUS_SUCCESS) return fd; return -1;

1 0

Marcus Meissner : user32: Remove duplicated call to GetSystemMenu (Coverity ).
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 626d0b75ba77edb1efdb0a99a3f099f36daec128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=626d0b75ba77edb1efdb0a99a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 18 15:33:56 2012 +0100 user32: Remove duplicated call to GetSystemMenu (Coverity). --- dlls/user32/nonclient.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 5ca0a8d..82a571d 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1470,14 +1470,12 @@ LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) { MSG msg; INT hittest = wParam; - HMENU hSysMenu = GetSystemMenu(hwnd, FALSE); switch (hittest) { case HTCAPTION: case HTSYSMENU: - hSysMenu = GetSystemMenu(hwnd, FALSE); - if (!hSysMenu) break; + if (!GetSystemMenu( hwnd, FALSE )) break; SetCapture( hwnd ); for (;;)

1 0

Jaka Kranjc : po: Update Slovenian translation.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: d01400fab0ca1b5d34a7455fc023f8838716e273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01400fab0ca1b5d34a7455fc… Author: Jaka Kranjc <smgl(a)lynxlynx.info> Date: Sun Feb 19 19:10:38 2012 +0100 po: Update Slovenian translation. --- po/sl.po | 291 +++++++++++++++++++++++++------------------------------------- 1 files changed, 118 insertions(+), 173 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d01400fab0ca1b5d34a74…

1 0

Francois Gouget : comctl32/tests: Make cbt_hook_proc() static.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 07d9d04de845990cf89851d2d542b1ad96260e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d9d04de845990cf89851d2d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:31:16 2012 +0100 comctl32/tests: Make cbt_hook_proc() static. --- dlls/comctl32/tests/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 2444975..9de319f 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1776,7 +1776,7 @@ static LRESULT WINAPI toolbar_subclass_proc(HWND hwnd, UINT msg, WPARAM wParam, return CallWindowProcA(oldproc, hwnd, msg, wParam, lParam); } -LRESULT CALLBACK cbt_hook_proc(int code, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK cbt_hook_proc(int code, WPARAM wParam, LPARAM lParam) { if (code == HCBT_CREATEWND) {

1 0

Francois Gouget : winedbg: The winedbg debug channel is unused in crashdlg. c so remove it.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 4f2d3e9b489b05baa5068aaf8d13e4aaa20a8943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2d3e9b489b05baa5068aaf8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:31:30 2012 +0100 winedbg: The winedbg debug channel is unused in crashdlg.c so remove it. --- programs/winedbg/crashdlg.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index fe13502..4e02a4b 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -26,13 +26,10 @@ #include "shellapi.h" #include "psapi.h" -#include "wine/debug.h" #include "wine/unicode.h" #include "resource.h" -WINE_DEFAULT_DEBUG_CHANNEL(winedbg); - #define MAX_PROGRAM_NAME_LENGTH 80 static char *crash_log;

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 22a37c633583f5660584b383f26dc4691fb576bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a37c633583f5660584b383f… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Feb 17 10:31:09 2012 +0100 po: Update Italian translation. --- po/it.po | 59 ++++++++++++++++++++++++----------------------------------- 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/po/it.po b/po/it.po index 5bb9940..4c07c8c 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,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: 2012-02-01 15:00+0100\n" +"PO-Revision-Date: 2012-02-17 10:25+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -5575,7 +5575,7 @@ msgstr "LB_SETCOUNT inviato non valido.\n" #: winerror.mc:2566 msgid "No tab stops on this list box.\n" -msgstr "Nessun tabstop in questa list box.\n" +msgstr "Nessun tab stop in questa list box.\n" #: winerror.mc:2571 msgid "Can't destroy object owned by another thread.\n" @@ -6691,7 +6691,7 @@ msgstr "" "Installa un prodotto:\n" "\t/i {pacchetto|codice_prodotto} [proprietà]\n" "\t/pacchetto {pacchetto|codice_prodotto} [proprietà]\n" -"\t/a pacchetto [property]\n" +"\t/a pacchetto [proprietà]\n" "Ripara un'installazione:\n" "\t/f[p|o|e|d|c|a|u|m|s|v] {pacchetto|codice_prodotto}\n" "Disinstalla un prodotto:\n" @@ -7917,17 +7917,14 @@ msgid "Administrative Tools" msgstr "Strumenti di amministrazione" #: shell32.rc:218 -#, fuzzy msgid "Music" msgstr "Musica" #: shell32.rc:219 -#, fuzzy msgid "Pictures" msgstr "Immagini" #: shell32.rc:220 -#, fuzzy msgid "Videos" msgstr "Video" @@ -7945,7 +7942,7 @@ msgstr "Collegamenti" #: shell32.rc:223 msgid "Slide Shows" -msgstr "Slide Shows" +msgstr "Presentazioni" #: shell32.rc:224 msgid "Playlists" @@ -7965,19 +7962,19 @@ msgstr "Modello" #: shell32.rc:225 msgid "Sample Music" -msgstr "" +msgstr "Musica condivisa" #: shell32.rc:226 msgid "Sample Pictures" -msgstr "" +msgstr "Immagini condivise" #: shell32.rc:227 msgid "Sample Playlists" -msgstr "" +msgstr "Playlist condivise" #: shell32.rc:228 msgid "Sample Videos" -msgstr "" +msgstr "Video condivisi" #: shell32.rc:229 msgid "Saved Games" @@ -9626,7 +9623,6 @@ msgstr "" "se chiamato dalla linea di comando.\n" #: cmd.rc:176 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9662,13 +9658,6 @@ msgstr "" "/ProgIDOpen Apri un documento usando il seguente progID.\n" "/L Mostra l'accordo di licenza con l'utente finale.\n" "/? Mostra questo aiuto ed esci.\n" -"\n" -"start.exe versione 0.2 Copyright (C) 2003, Dan Kegel\n" -"Start è fornito SENZA GARANZIA di alcun tipo; per ulteriori informazioni " -"eseguire start con l'opzione /L.\n" -"Questo è software libero e sei invitato a redistribuirlo sotto alcune " -"condizioni;\n" -" eseguire 'start' con l'opzione /L per ulteriori informazioni.\n" #: cmd.rc:201 msgid "TIME sets or shows the current system time.\n" @@ -9744,8 +9733,8 @@ msgid "" "PUSHD <directoryname> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <nomedellacartella> salva la cartella attuale su di uno\n" -"stack e poi la cambia con quella passata.\n" +"PUSHD <nomedellacartella> salva la cartella attuale in una\n" +"pila e poi la cambia con quella passata.\n" #: cmd.rc:238 msgid "POPD changes current directory to the last one saved with PUSHD.\n" @@ -9819,7 +9808,6 @@ msgstr "" "sistema operativo o alla shell dal quale hai chiamato cmd.\n" #: cmd.rc:305 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -9890,6 +9878,7 @@ msgstr "" "RD (RMDIR)\tElimina una sottocartella\n" "SET\t\tConfigura o mostra le variabili d'ambiente\n" "SETLOCAL\tInizia localizzazione dei cambiamenti d'ambiente in un file batch\n" +"START\t\tAvvia un programma o apre un documento con il programma associato\n" "TIME\t\tConfigura o cambia l'orario di sistema attuale\n" "TITLE\t\tConfigura il titolo della finestra per la sessione di CMD\n" "TYPE\t\tInserisce il contenuto di un file di testo\n" @@ -10407,7 +10396,7 @@ msgstr "F" #: notepad.rc:132 wordpad.rc:277 msgctxt "accelerator Replace" msgid "H" -msgstr "" +msgstr "H" #: notepad.rc:133 wordpad.rc:286 msgctxt "accelerator New" @@ -10422,27 +10411,27 @@ msgstr "O" #: notepad.rc:135 regedit.rc:321 wordpad.rc:289 msgctxt "accelerator Print" msgid "P" -msgstr "" +msgstr "P" #: notepad.rc:136 wordpad.rc:288 msgctxt "accelerator Save" msgid "S" -msgstr "" +msgstr "S" #: notepad.rc:137 msgctxt "accelerator Paste" msgid "V" -msgstr "" +msgstr "V" #: notepad.rc:138 wordpad.rc:279 msgctxt "accelerator Cut" msgid "X" -msgstr "" +msgstr "X" #: notepad.rc:139 wordpad.rc:281 msgctxt "accelerator Undo" msgid "Z" -msgstr "" +msgstr "Z" #: notepad.rc:66 msgid "Page &p" @@ -13509,7 +13498,7 @@ msgstr "Informazioni sulla versione" #: winefile.rc:197 msgctxt "accelerator Fullscreen" msgid "S" -msgstr "" +msgstr "S" #: winefile.rc:89 msgid "Applying font settings" @@ -13801,7 +13790,7 @@ msgstr "&Formato del carattere" #: wordpad.rc:61 msgid "&Def. char format" -msgstr "Formato del &def. car" +msgstr "Formato pre&definito del carattere" #: wordpad.rc:62 msgid "Paragrap&h format" @@ -13938,17 +13927,17 @@ msgstr "Barre" #: wordpad.rc:273 msgctxt "accelerator Align Left" msgid "L" -msgstr "" +msgstr "L" #: wordpad.rc:274 msgctxt "accelerator Align Center" msgid "E" -msgstr "" +msgstr "E" #: wordpad.rc:275 msgctxt "accelerator Align Right" msgid "R" -msgstr "" +msgstr "R" #: wordpad.rc:282 msgctxt "accelerator Redo" @@ -13963,12 +13952,12 @@ msgstr "B" #: wordpad.rc:284 msgctxt "accelerator Italic" msgid "I" -msgstr "" +msgstr "I" #: wordpad.rc:285 msgctxt "accelerator Underline" msgid "U" -msgstr "" +msgstr "U" #: wordpad.rc:136 msgid "All documents (*.*)"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 64f5ce5b3b77156a7ed776c308084c05c2470064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f5ce5b3b77156a7ed776c30… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Feb 18 11:36:23 2012 +0200 po: Update Finnish translation. --- po/fi.po | 916 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 496 insertions(+), 420 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64f5ce5b3b77156a7ed77…

1 0

Alexandre Julliard : gdi32: Paint everything in ExtFloodFill when the DIB doesn't have a clip region.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 21498d6c1115d18e4e070aa6ce33ae54c7cb16b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21498d6c1115d18e4e070aa6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 19 20:30:51 2012 +0100 gdi32: Paint everything in ExtFloodFill when the DIB doesn't have a clip region. --- dlls/gdi32/dibdrv/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 17d6994..3251f36 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -681,7 +681,7 @@ BOOL dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) static inline BOOL is_interior( dib_info *dib, HRGN clip, int x, int y, DWORD pixel, UINT type) { /* the clip rgn stops the flooding */ - if (!PtInRegion( clip, x, y )) return FALSE; + if (clip && !PtInRegion( clip, x, y )) return FALSE; if (type == FLOODFILLBORDER) return dib->funcs->get_pixel( dib, x, y ) != pixel; @@ -734,7 +734,7 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) RECT row; HRGN rgn; - TRACE( "(%p, %d, %d, %08x, %d\n", pdev, x, y, color, type ); + TRACE( "(%p, %d, %d, %08x, %d)\n", pdev, x, y, color, type ); if (!is_interior( &pdev->dib, pdev->clip, x, y, pixel, type )) return FALSE;

1 0

Gustavo Henrique Milaré : po: Update Brazilian Portuguese translation.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 8021d73a60dcd5ff41d90025476027c7bc4c5c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8021d73a60dcd5ff41d900254… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Fri Feb 17 16:14:33 2012 -0200 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 5acf55f..490620e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,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: 2012-02-11 22:12-0200\n" +"PO-Revision-Date: 2012-02-17 16:03-0200\n" "Last-Translator: Gustavo Henrique Milaré <gugamilare(a)gmail.com>\n" "Language-Team: none\n" "Language: Portuguese (Brazil)\n" @@ -563,11 +563,11 @@ msgstr "&Cores do Usuário:" #: comdlg32.rc:281 comdlg32.rc:304 msgid "Color | Sol&id" -msgstr "Colorido|Sólid&o" +msgstr "Cor | &Sólida" #: comdlg32.rc:282 msgid "&Red:" -msgstr "Ver&m:" +msgstr "&Rubro:" #: comdlg32.rc:284 msgid "&Green:" @@ -579,12 +579,12 @@ msgstr "A&zul:" #: comdlg32.rc:288 msgid "&Hue:" -msgstr "Mat&iz:" +msgstr "&Matiz:" #: comdlg32.rc:290 msgctxt "Saturation" msgid "&Sat:" -msgstr "Sa&t:" +msgstr "&Sat:" #: comdlg32.rc:292 msgctxt "Luminance" @@ -2114,10 +2114,9 @@ msgstr "D&esativar todos os propósitos para este certificado" msgid "Enable &only the following purposes for this certificate:" msgstr "A&tivar apenas os seguintes propósitos para este certificado:" -# Ellipsis removed - not enough space in button #: cryptui.rc:250 msgid "Add &Purpose..." -msgstr "Adicionar &Propósito" +msgstr "Adicionar &Propósito..." #: cryptui.rc:254 msgid "Add Purpose"

1 0

Juan Lang : cryptnet: Don' t call HttpEndRequest on a request that was never sent.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: eee39b12abc92cffdfbc6923a01cb174b4631b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee39b12abc92cffdfbc6923a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Feb 18 19:08:45 2012 -0800 cryptnet: Don't call HttpEndRequest on a request that was never sent. --- dlls/cryptnet/cryptnet_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 5d06396..3143604 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -967,7 +967,8 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, /* We don't set ret to TRUE in this block to avoid masking * an error from HttpSendRequestExW. */ - if (!HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context) && + if (ret && + !HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context) && GetLastError() == ERROR_IO_PENDING) { if (WaitForSingleObject(context->event,

1 0

Christian Costa : d3dxof: Fix parsing of empty array + tests.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 07931f73f0544e067c5a86b4ac92723c11600dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07931f73f0544e067c5a86b4a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Feb 19 21:02:51 2012 +0100 d3dxof: Fix parsing of empty array + tests. --- dlls/d3dxof/parsing.c | 2 +- dlls/d3dxof/tests/d3dxof.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index a6e387d..b2f51bb 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1315,7 +1315,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } - if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) + if (buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) { token = get_TOKEN(buf); if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA)) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 40ad10c..95dcd66 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -91,6 +91,25 @@ static char object_noname[] = "1; 2; 3;\n" "}\n"; +static char template_syntax_empty_array[] = +"xof 0302txt 0064\n" +"template Buffer\n" +"{\n" +"<3D82AB43-62DA-11CF-AB39-0020AF71E433>\n" +"DWORD num_elem;\n" +"array DWORD value[num_elem];\n" +"DWORD dummy;\n" +"}\n"; + +static char object_syntax_empty_array[] = +"xof 0302txt 0064\n" +"Buffer\n" +"{\n" +"0;\n" +";\n" +"1234;\n" +"}\n"; + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -457,6 +476,50 @@ static void test_getname(void) ok(ref == 0, "Got refcount %d, expected 0\n", ref); } +static void test_syntax(void) +{ + HRESULT hr; + ULONG ref; + LPDIRECTXFILE lpDirectXFile = NULL; + LPDIRECTXFILEENUMOBJECT lpdxfeo; + LPDIRECTXFILEDATA lpdxfd; + DXFILELOADMEMORY dxflm; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + hr = pDirectXFileCreate(&lpDirectXFile); + ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + if (!lpDirectXFile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_empty_array, sizeof(template_syntax_empty_array) - 1); + ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + dxflm.lpMemory = &object_syntax_empty_array; + dxflm.dSize = sizeof(object_syntax_empty_array) - 1; + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + if (hr == DXFILE_OK) + { + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + } + ref = IDirectXFile_Release(lpDirectXFile); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); +} + /* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 @@ -634,6 +697,7 @@ START_TEST(d3dxof) test_file_types(); test_compressed_files(); test_getname(); + test_syntax(); test_dump(); FreeLibrary(hd3dxof);

1 0

Christian Costa : d3dxof: Add tests for IDirectXFileData_GetName.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: ddecb6aae5d61fad0b95a76fe3e4ae178b4af8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddecb6aae5d61fad0b95a76fe… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Feb 19 21:02:42 2012 +0100 d3dxof: Add tests for IDirectXFileData_GetName. --- dlls/d3dxof/tests/d3dxof.c | 95 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 92 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 5c6315a..40ad10c 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -84,6 +84,13 @@ static char empty_bzip_file[] = "xof 0302bzip0064\x11\x00\x00\x00\x01\x00\x05\x0 static char empty_cmp_file[] = "xof 0302cmp 0064"; static char empty_xxxx_file[] = "xof 0302xxxx0064"; +static char object_noname[] = +"xof 0302txt 0064\n" +"Header\n" +"{\n" +"1; 2; 3;\n" +"}\n"; + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -115,7 +122,7 @@ static void test_refcount(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); - if(!lpDirectXFile) + if (!lpDirectXFile) { skip("Couldn't create DirectXFile interface\n"); return; @@ -187,7 +194,7 @@ static void test_CreateEnumObject(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); - if(!lpDirectXFile) + if (!lpDirectXFile) { skip("Couldn't create DirectXFile interface\n"); return; @@ -369,6 +376,87 @@ static void test_compressed_files(void) IDirectXFile_Release(dxfile); } +static void test_getname(void) +{ + HRESULT hr; + ULONG ref; + LPDIRECTXFILE lpDirectXFile = NULL; + LPDIRECTXFILEENUMOBJECT lpdxfeo; + LPDIRECTXFILEDATA lpdxfd; + DXFILELOADMEMORY dxflm; + char name[100]; + DWORD length; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + hr = pDirectXFileCreate(&lpDirectXFile); + ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + if (!lpDirectXFile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, sizeof(template) - 1); + ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + /* Check object with name */ + dxflm.lpMemory = &object; + dxflm.dSize = sizeof(object) - 1; + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + + hr = IDirectXFileData_GetName(lpdxfd, NULL, NULL); + ok(hr == DXFILEERR_BADVALUE, "IDirectXFileData_GetName: %x\n", hr); + hr = IDirectXFileData_GetName(lpdxfd, name, NULL); + ok(hr == DXFILEERR_BADVALUE, "IDirectXFileData_GetName: %x\n", hr); + hr = IDirectXFileData_GetName(lpdxfd, NULL, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 7, "Returned length should be 7 instead of %u\n", length); + length = sizeof(name); + hr = IDirectXFileData_GetName(lpdxfd, name, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 7, "Returned length should be 7 instead of %u\n", length); + ok(!strcmp(name, "Object"), "Returned string should be 'Object' intead of '%s'\n", name); + length = 3; + hr = IDirectXFileData_GetName(lpdxfd, name, &length); + ok(hr == DXFILEERR_BADVALUE, "IDirectXFileData_GetName: %x\n", hr); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + + /* Check object without name */ + dxflm.lpMemory = &object_noname; + dxflm.dSize = sizeof(object_noname) - 1; + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + + hr = IDirectXFileData_GetName(lpdxfd, NULL, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 0, "Returned length should be 0 instead of %u\n", length); + length = sizeof(name); + hr = IDirectXFileData_GetName(lpdxfd, name, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 0, "Returned length should be 0 instead of %u\n", length); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + ref = IDirectXFile_Release(lpDirectXFile); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); +} + /* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 @@ -381,7 +469,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) CONST GUID* clsid_type = NULL; char str_clsid[40]; char str_clsid_type[40]; - DWORD len= 100; + DWORD len = 100; LPDIRECTXFILEOBJECT pChildObj; int i; int j = 0; @@ -545,6 +633,7 @@ START_TEST(d3dxof) test_CreateEnumObject(); test_file_types(); test_compressed_files(); + test_getname(); test_dump(); FreeLibrary(hd3dxof);

1 0

Alexandre Julliard : Wine release 1.4-rc4
by Alexandre Julliard Feb. 17, 2012

Feb. 17, 2012

Module: website Branch: master Commit: 291e34cb107c17492587cd33bd677dc331e90007 URL: http://source.winehq.org/git/website.git/?a=commit;h=291e34cb107c17492587cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 20:50:14 2012 +0100 Wine release 1.4-rc4 --- news/en/2012021701.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/en/2012021701.xml b/news/en/2012021701.xml new file mode 100644 index 0000000..879c41e --- /dev/null +++ b/news/en/2012021701.xml @@ -0,0 +1,12 @@ +<news> +<date>February 17, 2012</date> +<title>Wine 1.4-rc4 Released</title> +<body> + The Wine development release 1.4-rc4 is now available. + <a href="{$root}/announce/1.4-rc4">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc4.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.4-rc4 : Alexandre Julliard : Release 1.4-rc4
by Alexandre Julliard Feb. 17, 2012

Feb. 17, 2012

Module: wine Branch: refs/tags/wine-1.4-rc4 Tag: 63b261131f58abbd36ed75772f4d565c9e002808 URL: http://source.winehq.org/git/wine.git/?a=tag;h=63b261131f58abbd36ed75772f4d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 20:40:19 2012 +0100 Release 1.4-rc4

1 0

Alexandre Julliard : Release 1.4-rc4.
by Alexandre Julliard Feb. 17, 2012

Feb. 17, 2012

Module: wine Branch: master Commit: 9629df6afb8e6df44a09f948c49388978d8075f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9629df6afb8e6df44a09f948c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 20:40:18 2012 +0100 Release 1.4-rc4. --- ANNOUNCE | 418 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 ++-- 3 files changed, 203 insertions(+), 235 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9629df6afb8e6df44a09f…

1 0

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

Feb. 17, 2012

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

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

Feb. 17, 2012

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

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

Feb. 17, 2012

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 Feb. 17, 2012

Feb. 17, 2012

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

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

Feb. 17, 2012

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