October 2010 - Wine-commits

Andrew Nguyen : krnl386.exe: Fix last error check for DOS compatibility hack.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 881feb6c8d6b47f67674dfea929f06d7d25994c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=881feb6c8d6b47f67674dfea9… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 30 07:42:55 2010 -0500 krnl386.exe: Fix last error check for DOS compatibility hack. (cherry picked from commit 4e49518a38cf0447f7b60813e100c4857ffb0537) --- dlls/krnl386.exe16/int21.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 4f7ae02..5f4b621 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -1092,7 +1092,8 @@ static BOOL INT21_CreateFile( CONTEXT86 *context, winMode, winAttributes, 0 ); /* DOS allows to open files on a CDROM R/W */ if( winHandle == INVALID_HANDLE_VALUE && - GetLastError()== ERROR_WRITE_PROTECT) { + (GetLastError() == ERROR_WRITE_PROTECT || + GetLastError() == ERROR_ACCESS_DENIED)) { winHandle = CreateFileW( pathW, winAccess & ~GENERIC_WRITE, winSharing, NULL, winMode, winAttributes, 0 ); }

1 0

Alexandre Julliard : gdi32: Replicate a Windows bug in StretchDIBits for top-down bitmaps in the non-stretching case .
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: d2755f23183a470e36054de9e6347f9423ed0985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2755f23183a470e36054de9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 14:19:25 2010 +0200 gdi32: Replicate a Windows bug in StretchDIBits for top-down bitmaps in the non-stretching case. Found by Mathias Kosch. (cherry picked from commit c68589e3dddcd93171b8af12e55b540689946d33) --- dlls/gdi32/dib.c | 8 ++++++++ dlls/gdi32/tests/bitmap.c | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index ce5ab8b..b95aee2 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -227,6 +227,14 @@ INT WINAPI StretchDIBits(HDC hdc, INT xDst, INT yDst, INT widthDst, return 0; } + if (xSrc == 0 && ySrc == 0 && widthDst == widthSrc && heightDst == heightSrc && + info->bmiHeader.biCompression == BI_RGB) + { + /* Windows appears to have a fast case optimization + * that uses the wrong origin for top-down DIBs */ + if (height < 0 && heightSrc < abs(height)) ySrc = abs(height) - heightSrc; + } + hBitmap = GetCurrentObject(hdc, OBJ_BITMAP); if (xDst == 0 && yDst == 0 && xSrc == 0 && ySrc == 0 && diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 8e5ad2e..e141f1d 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2813,7 +2813,7 @@ static void test_StretchDIBits(void) expected[2] = 0x00000000, expected[3] = 0x00000000; legacy_expected[0] = 0xFEDCBA98, legacy_expected[1] = 0x00000000; legacy_expected[2] = 0x00000000, legacy_expected[3] = 0x00000000; - todo_wine check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 0, 0, 1, 1, expected, legacy_expected, __LINE__); expected[0] = 0xFEDCBA98, expected[1] = 0xFEDCBA98;

1 0

Maarten Lankhorst : winmm: Fix fd leak on restarting timer.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: a9214f5f68fded57bf2f9271de7b0e9997bd45ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9214f5f68fded57bf2f9271d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Aug 10 16:04:24 2010 +0200 winmm: Fix fd leak on restarting timer. (cherry picked from commit 6910b0f1439b15d73783bcd276512a517fe8fd83) --- dlls/winmm/time.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index e692fb6..e055f6b 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -243,16 +243,19 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) static void TIME_MMTimeStart(void) { TIME_TimeToDie = 0; - if (!TIME_hMMTimer) { - HMODULE mod; - if (pipe(TIME_fdWake) < 0) - { + + if (TIME_fdWake[0] < 0) { + if (pipe(TIME_fdWake) < 0) { TIME_fdWake[0] = TIME_fdWake[1] = -1; ERR("Cannot create pipe: %s\n", strerror(errno)); } else { fcntl(TIME_fdWake[0], F_SETFL, O_NONBLOCK); fcntl(TIME_fdWake[1], F_SETFL, O_NONBLOCK); } + } + + if (!TIME_hMMTimer) { + HMODULE mod; GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)TIME_MMSysTimeThread, &mod); TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, mod, 0, NULL); SetThreadPriority(TIME_hMMTimer, THREAD_PRIORITY_TIME_CRITICAL);

1 0

Anders Jonsson : README: Update Swedish translation.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 094c7a2987617a4a1587c74a37aa388561d25bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=094c7a2987617a4a1587c74a3… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Aug 1 12:15:47 2010 +0200 README: Update Swedish translation. (cherry picked from commit d43c40aa8b8661de6c84de32d0efe27dfc81037e) --- documentation/README.sv | 59 ++++++++++++++++------------------------------ 1 files changed, 21 insertions(+), 38 deletions(-) diff --git a/documentation/README.sv b/documentation/README.sv index 7fea59d..bb12f7c 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -1,13 +1,13 @@ 1. INLEDNING Wine �r ett program som g�r det m�jligt att k�ra Windows-program -(inkluderat DOS, Windows 3.x och Win32) i Unix. Det best�r av en +(inkluderat DOS, Windows 3.x, Win32 och Win64) i Unix. Det best�r av en programstartare som startar och k�r Windows-programfiler, samt ett bibliotek (kallat Winelib) som implementerar Windows API-anrop med hj�lp av deras Unix- eller X11-motsvarigheter. Biblioteket kan ocks� anv�ndas -till att porta Win32-kod till vanliga Unix-program. +till att porta Windows-kod till vanliga Unix-program. -Wine �r fri programvara, utgett under villk�ren i GNU LGPL; se +Wine �r fri programvara, utgett under villkoren i GNU LGPL; se filen LICENSE f�r detaljer. 2. KOM IG�NG @@ -39,12 +39,12 @@ st Information f�r Linux �ven om Linux 2.2.x antagligen fortfarande fungerar, och Linux 2.0.x kanske fungerar (tidiga 2.0.x-versioner uppvisade tr�drelaterade problem), s� �r - det b�st att ha en nuvarande kernel som 2.4.x eller 2.6.x. + det b�st att ha en aktuell kernel som 2.4.x eller 2.6.x. Information f�r FreeBSD Wine kommer i regel inte fungera p� FreeBSD-versioner �ldre �n 6.3 eller 7.0. FreeBSD 6.3 kan uppdateras for att st�dja Wine. Se - <http://wiki.freebsd.org/Wine> f�r mer information. + http://wiki.freebsd.org/Wine f�r mer information. Information f�r Solaris Wine m�ste antagligen byggas med GNU toolchain (gcc, gas etc.). @@ -72,7 +72,7 @@ Grundl Du m�ste givetvis ocks� ha "make" (mest troligt "GNU make"). - Det �r ocks� n�dv�ndigt att ha flex 2.5 eller senare samt bison. + Det �r ocks� n�dv�ndigt att ha flex 2.5.33 eller senare samt bison. Valfria st�dbibliotek: configure-skriptet visar varningar n�r valfria bibliotek inte hittats. @@ -80,15 +80,16 @@ Valfria st vilka paket du b�r installera. P� 64 bit-system m�ste du s�kerst�lla att 32 bit-versionerna av - ovann�mnda bibliotek installerats; se - http://wiki.winehq.org/WineOn64bit f�r n�rmare detaljer. + ovann�mnda bibliotek installerats; se http://wiki.winehq.org/WineOn64bit + f�r n�rmare detaljer. Om du vill ha ett sant 64-bit Wine (eller en mixad + 32- och 64-bit Wine-installation), se http://wiki.winehq.org/Wine64 f�r + detaljer. 4. KOMPILERING K�r f�ljande kommandon f�r att bygga Wine om du inte anv�nder wineinstall: ./configure -make depend make Detta bygger programmet "wine" och diverse st�dbibliotek/programfiler. @@ -98,18 +99,6 @@ Windows-k K�r './configure --help' f�r att se inst�llningar och val vid kompilering. -G�r f�ljande f�r att uppgradera till en ny utg�va med hj�lp av en -uppdateringsfil: -G� in i utg�vans rotkatalog och k�r kommandot "make clean". -D�refter uppdaterar du utg�van med - - bunzip -c uppdateringsfil | patch -p1 - -d�r "uppdateringsfil" �r namnet p� uppdateringsfilen (n�got i stil med -wine-1.0.x.diff.bz2). D�refter kan du k�ra "./configure" och -"make depend && make". - - 5. INSTALLATION N�r Wine �r byggt kan du k�ra "make install" f�r att installera det; @@ -136,13 +125,11 @@ Exempel: f wine ~/.wine/drive_c/windows/notepad.exe (anv�ndning av Unix-filv�gar) - wine notepad.exe /parameter1 -parameter2 parameter3 - (k�ra program med parametrar) + wine notepad.exe readme.txt (k�ra program med parametrar) -Wine �r inte �nnu f�rdigutvecklat, s� det �r m�jligt att �tskilliga program -kraschar. I s� fall �ppnas Wines fels�kare, d�r du kan unders�ka och fixa -problemet. L�s delen "debugging" i Wines utvecklarmanual f�r mer information -om hur detta kan g�ras. +Wine �r inte perfekt, s� det �r m�jligt att vissa program kraschar. +I s� fall f�r du en kraschlogg som du b�r bifoga till din rapport d� du +rapporterar ett fel. 7. MER INFORMATION @@ -153,29 +140,25 @@ Internet: Mycket information om Wine finns samlat p Fr�gor: Fr�gor och svar om Wine finns samlade p� http://www.winehq.org/FAQ -Usenet: Du kan diskutera problem med Wine och f� hj�lp p� - comp.emulators.ms-windows.wine. - Fel: Rapportera fel till Wines Bugzilla p� http://bugs.winehq.org S�k i Bugzilla-databasen f�r att se om problemet redan finns - rapporterat innan du s�nder en felrapport. Du kan ocks� rapportera - fel till comp.emulators.ms-windows.wine. + rapporterat innan du s�nder en felrapport. IRC: Hj�lp finns tillg�nglig online p� kanalen #WineHQ p� irc.freenode.net. -GIT: Wines nuvarande utvecklingsversion finns tillg�nglig genom GIT. +Git: Wines nuvarande utvecklingsversion finns tillg�nglig genom Git. G� till http://www.winehq.org/git f�r mer information. E-postlistor: - Det finns flera e-postlistor f�r Wine-utvecklare; se - http://www.winehq.org/forums f�r mer information. + Det finns flera e-postlistor f�r Wine-anv�ndare och -utvecklare; se + http://www.winehq.org/forums f�r mer information. -Wiki: Wines Wiki finns p� http://wiki.winehq.org +Wiki: Wines Wiki finns p� http://wiki.winehq.org Om du l�gger till n�got eller fixar ett fel, �r det bra om du s�nder -en patch (i 'diff -u'-format) till listan wine-patches(a)winehq.org f�r -inkludering i n�sta utg�va av Wine. +en patch (f�rslagsvis med git-format-patch) till listan wine-patches(a)winehq.org +f�r inkludering i n�sta utg�va av Wine. -- Originalet till denna fil skrevs av

1 0

Jerome Leclanche : winepath: Add a -0 option to use null character as separator.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 34130dc7b4fe2be5cd5a16777b4020a0bd7c4d41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34130dc7b4fe2be5cd5a16777… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Aug 23 15:32:29 2010 +0100 winepath: Add a -0 option to use null character as separator. (cherry picked from commit 8c50936d30d6e1a83619f8fb8a273e9ceb9ebe3c) --- programs/winepath/winepath.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 1645ee9..c4a50fb 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -34,7 +34,8 @@ enum { SHORTFORMAT = 1, LONGFORMAT = 2, UNIXFORMAT = 4, - WINDOWSFORMAT = 8 + WINDOWSFORMAT = 8, + PRINT0 = 16, }; static const char progname[] = "winepath"; @@ -53,6 +54,7 @@ static int option(int shortopt, const WCHAR *longopt) " directory to the long format\n" " -s, --short converts the long Windows path of an existing file or\n" " directory to the short format\n" + " -0 separate output with \\0 character, instead of a newline\n" " -h, --help output this help message and exit\n" " -v, --version output version information and exit\n" "\n" @@ -76,6 +78,8 @@ static int option(int shortopt, const WCHAR *longopt) return UNIXFORMAT; case 'w': return WINDOWSFORMAT; + case '0': + return PRINT0; } fprintf(stderr, "%s: invalid option ", progname); @@ -148,8 +152,18 @@ int wmain(int argc, WCHAR *argv[]) char path[MAX_PATH]; int outputformats; int i; + int separator; outputformats = parse_options(argv); + + if (outputformats & PRINT0) + { + separator = '\0'; + outputformats ^= PRINT0; + } + else + separator = '\n'; + if (outputformats == 0) outputformats = UNIXFORMAT; @@ -181,12 +195,12 @@ int wmain(int argc, WCHAR *argv[]) if (outputformats & LONGFORMAT) { if (GetLongPathNameW(argv[i], dos_pathW, MAX_PATH)) WideCharToMultiByte(CP_UNIXCP, 0, dos_pathW, -1, path, MAX_PATH, NULL, NULL); - printf("%s\n", path); + printf("%s%c", path, separator); } if (outputformats & SHORTFORMAT) { if (GetShortPathNameW(argv[i], dos_pathW, MAX_PATH)) WideCharToMultiByte(CP_UNIXCP, 0, dos_pathW, -1, path, MAX_PATH, NULL, NULL); - printf("%s\n", path); + printf("%s%c", path, separator); } if (outputformats & UNIXFORMAT) { WCHAR *ntpath, *tail; @@ -205,11 +219,11 @@ int wmain(int argc, WCHAR *argv[]) if (tail) { WideCharToMultiByte(CP_UNIXCP, 0, tail+1, -1, path, MAX_PATH, NULL, NULL); - printf("%s/%s\n", unix_name, path); + printf("%s/%s%c", unix_name, path, separator); } else { - printf("%s\n", unix_name); + printf("%s%c", unix_name, separator); } HeapFree( GetProcessHeap(), 0, unix_name ); break; @@ -257,7 +271,7 @@ int wmain(int argc, WCHAR *argv[]) if ((windows_name = wine_get_dos_file_name_ptr(unix_name))) { WideCharToMultiByte(CP_UNIXCP, 0, windows_name, -1, path, MAX_PATH, NULL, NULL); - printf("%s\n", path); + printf("%s%c", path, separator); HeapFree( GetProcessHeap(), 0, windows_name ); } else printf( "\n" );

1 0

Peter Rosin : winepath: Adhere to the requested separator on failure.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: a93af653c0578190a72fe263d708d4b1f5d6e776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a93af653c0578190a72fe263d… Author: Peter Rosin <peda(a)lysator.liu.se> Date: Fri Aug 27 07:54:52 2010 +0200 winepath: Adhere to the requested separator on failure. (cherry picked from commit ed62749cc85b3bdc02a4e9d8aec98355dcfbfd07) --- programs/winepath/winepath.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index c4a50fb..6e5f58d 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -237,7 +237,7 @@ int wmain(int argc, WCHAR *argv[]) /* This is a complete path conversion failure. * It would typically happen if ntpath == "". */ - printf("\n"); + printf("%c", separator); break; } c=slash+1; @@ -249,7 +249,7 @@ int wmain(int argc, WCHAR *argv[]) /* If this is not a valid NT path to start with, * then obviously we cannot convert it. */ - printf("\n"); + printf("%c", separator); break; } if (tail) @@ -274,7 +274,7 @@ int wmain(int argc, WCHAR *argv[]) printf("%s%c", path, separator); HeapFree( GetProcessHeap(), 0, windows_name ); } - else printf( "\n" ); + else printf("%c", separator); HeapFree( GetProcessHeap(), 0, unix_name ); } }

1 0

Vincent Povirk : wineboot: Query windows from all desktops when --end-session --kill is used.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 0028b4fd7f17f0e0c2b2390426d457530108f8de URL: http://source.winehq.org/git/wine.git/?a=commit;h=0028b4fd7f17f0e0c2b239042… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 18 13:36:36 2010 -0500 wineboot: Query windows from all desktops when --end-session --kill is used. (cherry picked from commit 4f30ff875bfc556a2a69bf45218129cd196e5105) --- programs/wineboot/shutdown.c | 39 +++++++++++++++++++++++++++++++++++++++ programs/wineboot/wineboot.c | 7 ++++++- 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index ed80bf0..cebe16b 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -322,6 +322,45 @@ BOOL shutdown_close_windows( BOOL force ) return (result != 0); } +static BOOL CALLBACK shutdown_one_desktop( LPWSTR name, LPARAM force ) +{ + HDESK hdesk; + + WINE_TRACE("Shutting down desktop %s\n", wine_dbgstr_w(name)); + + hdesk = OpenDesktopW( name, 0, FALSE, GENERIC_ALL ); + if (hdesk == NULL) + { + WINE_ERR("Cannot open desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); + return 0; + } + + if (!SetThreadDesktop( hdesk )) + { + CloseDesktop( hdesk ); + WINE_ERR("Cannot set thread desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); + return 0; + } + + CloseDesktop( hdesk ); + + return shutdown_close_windows( force ); +} + +BOOL shutdown_all_desktops( BOOL force ) +{ + BOOL ret; + HDESK prev_desktop; + + prev_desktop = GetThreadDesktop(GetCurrentThreadId()); + + ret = EnumDesktopsW( NULL, shutdown_one_desktop, (LPARAM)force ); + + SetThreadDesktop(prev_desktop); + + return ret; +} + /* forcibly kill all processes without any cleanup */ void kill_processes( BOOL kill_desktop ) { diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 32ac3ac..02d3746 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -88,6 +88,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineboot); #define MAX_LINE_LENGTH (2*MAX_PATH+2) extern BOOL shutdown_close_windows( BOOL force ); +extern BOOL shutdown_all_desktops( BOOL force ); extern void kill_processes( BOOL kill_desktop ); static WCHAR windowsdir[MAX_PATH]; @@ -1142,7 +1143,11 @@ int main( int argc, char *argv[] ) if (end_session) { - if (!shutdown_close_windows( force )) return 1; + if (kill) + { + if (!shutdown_all_desktops( force )) return 1; + } + else if (!shutdown_close_windows( force )) return 1; } if (kill) kill_processes( shutdown );

1 0

Vincent Povirk : wineboot: Don' t abort shutdown if we have to terminate a process.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 20a1bc4f0c77d219b40a73a8a2ee68a15bf54d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a1bc4f0c77d219b40a73a8a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 22 16:49:35 2010 -0500 wineboot: Don't abort shutdown if we have to terminate a process. We can sometimes get a FALSE result from WM_QUERYENDSESSION as a side-effect of terminating a process. We should continue the shutdown process in this case. (cherry picked from commit da8904d150694ba82b201ec72e2e94cba9dd4475) --- programs/wineboot/shutdown.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index cebe16b..ac3019c 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -113,6 +113,7 @@ struct endtask_dlg_data { struct window_info *win; BOOL cancelled; + BOOL terminated; }; static INT_PTR CALLBACK endtask_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) @@ -138,6 +139,7 @@ static INT_PTR CALLBACK endtask_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LP WINE_TRACE( "terminating process %04x\n", data->win[0].pid ); TerminateProcess( handle, 0 ); CloseHandle( handle ); + data->terminated = TRUE; } return TRUE; case MAKEWPARAM(IDCANCEL, BN_CLICKED): @@ -175,6 +177,7 @@ static LRESULT send_messages_with_timeout_dialog( cb_data->window_count = count; dlg_data.win = win; + dlg_data.terminated = FALSE; dlg_data.cancelled = FALSE; for (i = 0; i < count; i++) @@ -211,7 +214,7 @@ static LRESULT send_messages_with_timeout_dialog( } if (!cb_data->window_count) { - result = cb_data->result; + result = dlg_data.terminated || cb_data->result; HeapFree( GetProcessHeap(), 0, cb_data ); if (!result) goto cleanup;

1 0

Huw Davies : rpcrt4: Add a missing STUBLESS_INITOUT case.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 96160967287eb4c3f35a8433c5f44f81f5fffd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=96160967287eb4c3f35a8433c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 2 15:24:53 2010 +0100 rpcrt4: Add a missing STUBLESS_INITOUT case. (cherry picked from commit 300536d88e0370d66391759fde414aa3accbc467) --- dlls/rpcrt4/ndr_stubless.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index ed7912f..243c55a 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1258,6 +1258,8 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE) call_freer(pStubMsg, pArg, pTypeFormat); break; + case STUBLESS_INITOUT: + break; case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE) call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); @@ -1512,13 +1514,6 @@ LONG WINAPI NdrStubCall2( if (pThis) *(void **)args = ((CStdStubBuffer *)pThis)->pvServerObject; - /* order of phases: - * 1. STUBLESS_UNMARHSAL - unmarshal [in] params from buffer - * 2. STUBLESS_CALLSERVER - send/receive buffer - * 3. STUBLESS_CALCSIZE - get [out] buffer size - * 4. STUBLESS_GETBUFFER - allocate [out] buffer - * 5. STUBLESS_MARHSAL - marshal [out] params to buffer - */ for (phase = STUBLESS_UNMARSHAL; phase <= STUBLESS_FREE; phase++) { TRACE("phase = %d\n", phase);

1 0

Alexandre Julliard : server: Try to use /proc/pid/ mem to read process memory since it should be faster.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: ad521cac57d8be07b592f255ee5e802743e62a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad521cac57d8be07b592f255e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 10:50:12 2010 +0200 server: Try to use /proc/pid/mem to read process memory since it should be faster. (cherry picked from commit 1a79912a10a6cded54d1f1de5f746bbffec3ffee) --- server/ptrace.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 1118048..111368b 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -19,9 +19,11 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <stdio.h> #include <signal.h> #include <stdarg.h> @@ -377,6 +379,24 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t if (suspend_for_ptrace( thread )) { + if (len > 3) /* /proc/pid/mem should be faster for large sizes */ + { + char procmem[24]; + int fd; + + sprintf( procmem, "/proc/%u/mem", process->unix_pid ); + if ((fd = open( procmem, O_RDONLY )) != -1) + { + ssize_t ret = pread( fd, dest, size, ptr ); + close( fd ); + if (ret == size) + { + len = 0; + goto done; + } + } + } + if (len > 1) { if (read_thread_long( thread, addr++, &data ) == -1) goto done;

1 0