February 2010 - Wine-commits

Andrey Turkin : kernel32: Use TEB-based buffer in CreateMutexExA.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 2db497e89e8e4a37a8bd569b8691b9b87ae63606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db497e89e8e4a37a8bd569b8… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Feb 23 18:41:27 2010 +0300 kernel32: Use TEB-based buffer in CreateMutexExA. --- dlls/kernel32/sync.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index fbe055d..0ba2ad1 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -614,16 +614,19 @@ HANDLE WINAPI CreateMutexW( SECURITY_ATTRIBUTES *sa, BOOL owner, LPCWSTR name ) */ HANDLE WINAPI CreateMutexExA( SECURITY_ATTRIBUTES *sa, LPCSTR name, DWORD flags, DWORD access ) { - WCHAR buffer[MAX_PATH]; + ANSI_STRING nameA; + NTSTATUS status; if (!name) return CreateMutexExW( sa, NULL, flags, access ); - if (!MultiByteToWideChar( CP_ACP, 0, name, -1, buffer, MAX_PATH )) + RtlInitAnsiString( &nameA, name ); + status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString, &nameA, FALSE ); + if (status != STATUS_SUCCESS) { SetLastError( ERROR_FILENAME_EXCED_RANGE ); return 0; } - return CreateMutexExW( sa, buffer, flags, access ); + return CreateMutexExW( sa, NtCurrentTeb()->StaticUnicodeString.Buffer, flags, access ); }

1 0

Andrey Turkin : extrac32: Implement /C mode.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 7628fcdd76eece53960dac5554ecc241feff2135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7628fcdd76eece53960dac555… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Feb 23 18:41:47 2010 +0300 extrac32: Implement /C mode. --- programs/extrac32/Makefile.in | 2 +- programs/extrac32/extrac32.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/programs/extrac32/Makefile.in b/programs/extrac32/Makefile.in index 78e4fef..3ee70a9 100644 --- a/programs/extrac32/Makefile.in +++ b/programs/extrac32/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = extrac32.exe APPMODE = -mwindows -municode EXTRADEFS = -DWINE_NO_UNICODE -IMPORTS = shell32 setupapi user32 kernel32 +IMPORTS = shell32 setupapi shlwapi user32 kernel32 C_SRCS = \ extrac32.c diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 7e66458..d7f2da4 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -22,12 +22,15 @@ #include <windows.h> #include <shellapi.h> #include <setupapi.h> +#include <shlwapi.h> #include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(extrac32); +static BOOL force_mode; + static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2) { FILE_IN_CABINET_INFO_W *pInfo; @@ -54,6 +57,31 @@ static void extract(LPCWSTR cabfile, LPWSTR destdir) WINE_ERR("Could not extract cab file %s\n", wine_dbgstr_w(cabfile)); } +static void copy_file(LPCWSTR source, LPCWSTR destination) +{ + WCHAR destfile[MAX_PATH]; + + /* append source filename if destination is a directory */ + if (PathIsDirectoryW(destination)) + { + PathCombineW(destfile, destination, PathFindFileNameW(source)); + destination = destfile; + } + + if (PathFileExistsW(destination) && !force_mode) + { + static const WCHAR overwriteMsg[] = {'O','v','e','r','w','r','i','t','e',' ','"','%','s','"','?',0}; + static const WCHAR titleMsg[] = {'E','x','t','r','a','c','t',0}; + WCHAR msg[MAX_PATH+100]; + snprintfW(msg, sizeof(msg)/sizeof(msg[0]), overwriteMsg, destination); + if (MessageBoxW(NULL, msg, titleMsg, MB_YESNO | MB_ICONWARNING) != IDYES) + return; + } + + WINE_TRACE("copying %s to %s\n", wine_dbgstr_w(source), wine_dbgstr_w(destination)); + CopyFileW(source, destination, FALSE); +} + int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int show) { LPWSTR *argv; @@ -90,7 +118,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho WINE_FIXME("/A not implemented\n"); break; case 'Y': - WINE_FIXME("/Y not implemented\n"); + force_mode = TRUE; break; case 'L': if ((i + 1) >= argc) return 0; @@ -128,7 +156,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho { case 'C': /* Copy file */ - WINE_FIXME("/C not implemented\n"); + copy_file(cabfile, path); break; case 'E': /* Extract CAB archive */

1 0

Paul Chitescu : quartz: Do not assert() the existence of a media format of an input pin.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: daa49433224eb64aa381ebd83ed4e3e6f4ee1a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa49433224eb64aa381ebd83… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Feb 23 22:37:40 2010 +0200 quartz: Do not assert() the existence of a media format of an input pin. --- dlls/quartz/pin.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 2e24d52..ca34d93 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -765,9 +765,6 @@ HRESULT WINAPI OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDI { assert(pmtCandidate); dump_AM_MEDIA_TYPE(pmtCandidate); - if (!IsEqualGUID(&FORMAT_None, &pmtCandidate->formattype) - && !IsEqualGUID(&GUID_NULL, &pmtCandidate->formattype)) - assert(pmtCandidate->pbFormat); if (( !pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE) ) && (This->pConnectSpecific(iface, pReceivePin, pmtCandidate) == S_OK)) {

1 0

Nikolay Sivov : user32/tests: Test to show that caption added for WS_EX_LAYERED as well.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 9b7b3ef1c4d97c1fadfe78f3a73c85c86fdb5eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7b3ef1c4d97c1fadfe78f3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 23 13:18:26 2010 -0500 user32/tests: Test to show that caption added for WS_EX_LAYERED as well. --- dlls/user32/tests/win.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cd83749..03ff8f5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3424,6 +3424,14 @@ static void test_window_styles(void) check_window_style(WS_CHILD, WS_EX_DLGMODALFRAME|WS_EX_STATICEDGE, WS_CHILD, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); check_window_style(WS_CAPTION, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE); check_window_style(0, WS_EX_APPWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_APPWINDOW|WS_EX_WINDOWEDGE); + + if (pGetLayeredWindowAttributes) + { + check_window_style(0, WS_EX_LAYERED, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_LAYERED|WS_EX_WINDOWEDGE); + check_window_style(0, WS_EX_LAYERED|WS_EX_TRANSPARENT, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_WINDOWEDGE); + check_window_style(0, WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, + WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_TOOLWINDOW|WS_EX_WINDOWEDGE); + } } static void test_scrollwindow( HWND hwnd)

1 0

Nikolay Sivov : user32: Intersect with passed dirty rectangle while blitting.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 62019e6d3a768f5bdd5b16936362722f7b1261ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=62019e6d3a768f5bdd5b16936… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 24 00:20:12 2010 +0300 user32: Intersect with passed dirty rectangle while blitting. --- dlls/user32/win.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index adf74d0..8ed49d8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3392,18 +3392,18 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF cy = info->psize->cy; flags &= ~SWP_NOSIZE; } - TRACE( "moving window %p pos %d,%d %dx%x\n", hwnd, x, y, cx, cy ); + TRACE( "moving window %p pos %d,%d %dx%d\n", hwnd, x, y, cx, cy ); SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); } if (info->hdcSrc) { - RECT rect; HDC hdc = GetDCEx( hwnd, 0, DCX_CACHE ); if (hdc) { int x = 0, y = 0; + RECT rect; GetClientRect( hwnd, &rect ); if (info->pptSrc) @@ -3411,10 +3411,13 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF x = info->pptSrc->x; y = info->pptSrc->y; } - /* FIXME: intersect rect with info->prcDirty */ - TRACE( "copying window %p pos %d,%d\n", hwnd, x, y ); - BitBlt( hdc, rect.left, rect.top, rect.right, rect.bottom, - info->hdcSrc, rect.left + x, rect.top + y, SRCCOPY ); + + if (!info->prcDirty || (info->prcDirty && IntersectRect(&rect, &rect, info->prcDirty))) + { + TRACE( "copying window %p pos %d,%d\n", hwnd, x, y ); + BitBlt( hdc, rect.left, rect.top, rect.right, rect.bottom, + info->hdcSrc, rect.left + x, rect.top + y, SRCCOPY ); + } ReleaseDC( hwnd, hdc ); } }

1 0

Ken Thomases : ntdll: Mac: Fix leak of send right for Mach thread port.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 07d005de84705eabdd134c94b9864c2a4bec6da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d005de84705eabdd134c94b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 24 00:52:13 2010 -0600 ntdll: Mac: Fix leak of send right for Mach thread port. The leaked send right kept the port alive for threads that are gone. For processes which create a lot of threads, this can cause performance problems. --- dlls/ntdll/server.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 1eea402..568f0c5 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -942,6 +942,7 @@ static int get_unix_tid(void) ret = pthread_self(); #elif defined(__APPLE__) ret = mach_thread_self(); + mach_port_deallocate(mach_task_self(), ret); #elif defined(__FreeBSD__) long lwpid; thr_self( &lwpid );

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.39
by Jeremy Newman 23 Feb '10

23 Feb '10

Module: website Branch: master Commit: a46478ee524149127f4dc2e023c4c770a4f9d6fb URL: http://source.winehq.org/git/website.git/?a=commit;h=a46478ee524149127f4dc2… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Feb 23 14:18:33 2010 +0100 Polish translation for release 1.1.39 --- news/pl/2010021901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2010021901.xml b/news/pl/2010021901.xml new file mode 100644 index 0000000..614a483 --- /dev/null +++ b/news/pl/2010021901.xml @@ -0,0 +1,17 @@ +<news> +<date>Luty 19, 2010</date> +<title>Wydano Wine 1.1.39</title> +<body> + Wydanie rozwojowe Wine 1.1.39 jest już dostępne. + <a href="{$root}/announce/1.1.39">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla dowiązań symbolicznych w rejestrze.</li> + <li>Wiele poprawek w MSI.</li> + <li>Ulepszenia w procesie budowania.</li> + <li>Poprawki i porządki w MSXML.</li> + <li>Liczne ulepszenia w MSHTML.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.39.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : makefiles: Always build dependencies by default and get rid of the auto-depend rules.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: 1784adca8bf643fd4a975ed1694b5835190bfa8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1784adca8bf643fd4a975ed16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 13:44:55 2010 +0100 makefiles: Always build dependencies by default and get rid of the auto-depend rules. --- aclocal.m4 | 8 +- configure | 1086 +++++++++++++++++++++++++++++----------------------------- configure.ac | 7 - 3 files changed, 544 insertions(+), 557 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1784adca8bf643fd4a975…

1 0

Alexandre Julliard : makefiles: Add some shell function helpers to generate the makefile rules.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: fc7f1c7e5a5392db3bfc467c88782e3bb4ee2047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc7f1c7e5a5392db3bfc467c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 14:24:57 2010 +0100 makefiles: Add some shell function helpers to generate the makefile rules. --- aclocal.m4 | 74 +- configure | 3962 ++++++++++++------------------------------------------------ 2 files changed, 852 insertions(+), 3184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc7f1c7e5a5392db3bfc4…

1 0

Christian Costa : shell32: Allow copy operation to overwrite an existing write protected file + tests .
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: 240afab36275d72c10f6dc4bcc52419562ef240f URL: http://source.winehq.org/git/wine.git/?a=commit;h=240afab36275d72c10f6dc4bc… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Feb 23 09:53:23 2010 +0100 shell32: Allow copy operation to overwrite an existing write protected file + tests. --- dlls/shell32/shlfileop.c | 8 +++++++- dlls/shell32/tests/shlfileop.c | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 0b08f52..702a6c0 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -624,9 +624,15 @@ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists) { BOOL ret; + DWORD attribs; TRACE("(%s %s %s)\n", debugstr_w(src), debugstr_w(dest), bFailIfExists ? "failIfExists" : ""); + /* Destination file may already exist with read only attribute */ + attribs = GetFileAttributesW(dest); + if (IsAttrib(attribs, FILE_ATTRIBUTE_READONLY)) + SetFileAttributesW(dest, attribs & ~FILE_ATTRIBUTE_READONLY); + ret = CopyFileW(src, dest, bFailIfExists); if (ret) { @@ -1132,7 +1138,7 @@ static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCH if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op)) return 0; } - + return SHNotifyCopyFileW(szFrom, szTo, FALSE) == 0; } diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 777801e..08867c8 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -965,6 +965,26 @@ static void test_copy(void) ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); ok(file_exists("testdir2\\test1.txt"), "Expected testdir2\\test1 to exist\n"); + /* try to overwrite an existing write protected file */ + clean_after_shfo_tests(); + init_shfo_tests(); + tmp_flags = shfo.fFlags; + shfo.pFrom = "test1.txt\0"; + shfo.pTo = "test2.txt\0"; + /* suppress the error-dialog in win9x here */ + shfo.fFlags = FOF_NOERRORUI | FOF_NOCONFIRMATION | FOF_SILENT; + ok(SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_READONLY), + "Failure to set file attributes (error %x)\n", GetLastError()); + retval = CopyFileA(shfo.pFrom, shfo.pTo, FALSE); + ok(!retval && GetLastError() == ERROR_ACCESS_DENIED, "CopyFileA should have fail with ERROR_ACCESS_DENIED\n"); + retval = SHFileOperationA(&shfo); + /* Does not work on Win95, Win95B, NT4WS and NT4SRV */ + ok(!retval || broken(retval == DE_OPCANCELLED), "SHFileOperationA failed to copy (error %x)\n", retval); + /* Set back normal attributes to make the file deletion succeed */ + ok(SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_NORMAL), + "Failure to set file attributes (error %x)\n", GetLastError()); + shfo.fFlags = tmp_flags; + /* try to copy files to a file */ clean_after_shfo_tests(); init_shfo_tests();

1 0