July 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : libwine: Fix the default Unicode character for codepage 20932.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 5fbb68769a3f5175dbeffa90bd62a765b19b63a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fbb68769a3f5175dbeffa90b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 22 09:59:46 2013 +0200 libwine: Fix the default Unicode character for codepage 20932. --- libs/wine/c_20932.c | 3674 +++++++++++++++++++++++++------------------------- tools/make_unicode | 2 +- 2 files changed, 1838 insertions(+), 1838 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fbb68769a3f5175dbeff…

1 0

Łukasz Wojniłowicz : Polish translation for release 1.6
by Jeremy Newman July 22, 2013

July 22, 2013

Module: website Branch: master Commit: e89ad557d2ad1894326235a9849ec17c77458880 URL: http://source.winehq.org/git/website.git/?a=commit;h=e89ad557d2ad1894326235… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Jul 19 15:51:36 2013 +0200 Polish translation for release 1.6 --- news/pl/2013071801.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/news/pl/2013071801.xml b/news/pl/2013071801.xml new file mode 100644 index 0000000..6bee54c --- /dev/null +++ b/news/pl/2013071801.xml @@ -0,0 +1,10 @@ +<news> +<date>Lipiec 18, 2013</date> +<title>Wydano Wine 1.6</title> +<body> + Zespół Wine z dumą ogłasza, że stabilne wydanie Wine 1.6 jest już dostępne. + Wydanie to stanowi 16 miesięcy pracy programistów, która przyniosła ponad 10,000 indywidualnych zmian w kodzie. Głównymi nowościami jest nowy sterownik Mac, pełne wsparcie dla przezroczystości okien i nowy pakiet Mono do wspierania aplikacji .NET. + Wydanie zostało ulepszone wzdłuż i wszerz, przez co pozwala na uruchomienie wielu nowych gier i programów. Obejrzyj poniższe <a href="{$root}/announce/1.6">uwagi o wydaniu</a> , aby zapoznać się z głównymi zmianami. +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : Link to translated wiki homepage in French main help page (try 2)
by Jeremy Newman July 22, 2013

July 22, 2013

Module: website Branch: master Commit: e56f002fdd299b4eac31a13a25338a19c48413af URL: http://source.winehq.org/git/website.git/?a=commit;h=e56f002fdd299b4eac31a1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 16:13:43 2013 +0200 Link to translated wiki homepage in French main help page (try 2) --- templates/fr/help.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/fr/help.template b/templates/fr/help.template index aa18446..493213e 100644 --- a/templates/fr/help.template +++ b/templates/fr/help.template @@ -50,7 +50,7 @@ payant pour Wine. <a href="http://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"> Wiki</a> </td> <td valign="top"> - Notre <a href="http://wiki.winehq.org/">wiki</a> peut aussi vous aider. + Notre <a href="http://wiki.winehq.org/PageD'Accueil">wiki</a> peut aussi vous aider. </td> </tr> @@ -93,7 +93,7 @@ intéressante. <a href="http://bugs.winehq.org/"><img src="{$root}/images/bugs.png"> Bugzilla</a> </td> <td valign="top"> - Notre <a href="http://bugs.winehq.org/">système Bugzilla de suivi des bogues</a> + Notre <a href="http://bugs.winehq.org/">système Bugzilla de suivi des bugs</a> présente tous les problèmes sur lesquels nous avons travaillé ou travaillons actuellement. </td> </tr>

1 0

Nikolay Sivov : windowscodecs: Added GetPixelFormat() for bitmap clipper.
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: 4bbb285d5e100d3f2c1a9fc1a5726e8e6e5f28b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bbb285d5e100d3f2c1a9fc1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 19 00:29:18 2013 +0400 windowscodecs: Added GetPixelFormat() for bitmap clipper. --- dlls/windowscodecs/clipper.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/clipper.c b/dlls/windowscodecs/clipper.c index f6d5e02..91d234e 100644 --- a/dlls/windowscodecs/clipper.c +++ b/dlls/windowscodecs/clipper.c @@ -118,8 +118,16 @@ static HRESULT WINAPI BitmapClipper_GetSize(IWICBitmapClipper *iface, static HRESULT WINAPI BitmapClipper_GetPixelFormat(IWICBitmapClipper *iface, WICPixelFormatGUID *format) { - FIXME("(%p,%p): stub\n", iface, format); - return E_NOTIMPL; + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + TRACE("(%p,%p)\n", iface, format); + + if (!format) + return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + + return IWICBitmapSource_GetPixelFormat(This->source, format); } static HRESULT WINAPI BitmapClipper_GetResolution(IWICBitmapClipper *iface,

1 0

Frédéric Delanoy : loader: Fix wine manpage formatting.
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: 5cbf1736363b76b8882f1dde0d9c4a998ad6010c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbf1736363b76b8882f1dde0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 19 14:59:14 2013 +0200 loader: Fix wine manpage formatting. --- loader/wine.man.in | 138 ++++++++++++++++++++++----------------------------- 1 files changed, 60 insertions(+), 78 deletions(-) diff --git a/loader/wine.man.in b/loader/wine.man.in index 16b4ae3..6b60000 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -2,8 +2,8 @@ .SH NAME wine \- run Windows programs on Unix .SH SYNOPSIS -.BI "wine " program -[arguments ... ] +.B wine +.IR "program " [ arguments ] .br .B wine --help .br @@ -47,27 +47,25 @@ or in Unix format You may pass arguments to the program being executed by adding them to the end of the command line invoking .B wine -(such as: wine notepad C:\(rs\(rsTEMP\(rs\(rsREADME.TXT). +(such as: \fIwine notepad C:\(rs\(rsTEMP\(rs\(rsREADME.TXT\fR). Note that you need to '\(rs' escape special characters (and spaces) when invoking Wine via a shell, e.g. .PP wine C:\(rs\(rsProgram\(rs Files\(rs\(rsMyPrg\(rs\(rstest.exe .PP -.SH ENVIRONMENT VARIABLES -.B wine -makes the environment variables of the shell from which +.SH ENVIRONMENT .B wine -is started accessible to the windows/dos processes started. So use the +makes the environment variables of the shell from which it +is started accessible to the Windows/DOS processes started. So use the appropriate syntax for your shell to enter environment variables you need. .TP -.I WINEPREFIX -If set, the content of this variable is taken as the name of the directory where -.B wine -stores its data (the default is +.B WINEPREFIX +If set, the contents of this variable is taken as the name of the directory where +Wine stores its data (the default is .IR $HOME/.wine ). This directory is also used to identify the socket which is used to communicate with the -.IR wineserver . +.BR wineserver . All .B wine processes using the same @@ -75,34 +73,34 @@ processes using the same (i.e.: same user) share certain things like registry, shared memory, and config file. By setting -.I WINEPREFIX +.B WINEPREFIX to different values for different .B wine processes, it is possible to run a number of truly independent .B wine processes. .TP -.I WINESERVER +.B WINESERVER Specifies the path and name of the .B wineserver binary. If not set, Wine will try to load -.BR @bindir@/wineserver , +.IR @bindir@/wineserver , and if this doesn't exist it will then look for a file named "wineserver" in the path and in a few other likely locations. .TP -.I WINELOADER +.B WINELOADER Specifies the path and name of the .B wine binary to use to launch new Windows processes. If not set, Wine will try to load -.BR @bindir@/wine , +.IR @bindir@/wine , and if this doesn't exist it will then look for a file named "wine" in the path and in a few other likely locations. .TP -.I WINEDEBUG +.B WINEDEBUG Turns debugging messages on or off. The syntax of the variable is of the form -.RI [ class ][+/-] channel [,[ class2 ][+/-] channel2 ]. +.RI [ class ][\fB+\fR|\fB-\fR] channel [,[ class2 ][\fB+\fR|\fB-\fR] channel2 ] .RS +7 .PP .I class @@ -116,12 +114,11 @@ If .I class is not specified, all debugging messages for the specified channel are turned on. Each channel will print messages about a particular -component of -.BR wine . -The following character can be either + or - to switch the specified +component of Wine. +The following character can be either \fB+\fR or \fB-\fR to switch the specified channel on or off respectively. If there is no .I class -part before it, a leading + can be omitted. Note that spaces are not +part before it, a leading \fB+\fR\fR can be omitted. Note that spaces are not allowed anywhere in the string. .PP Examples: @@ -150,24 +147,21 @@ For more information on debugging messages, see the chapter of the Wine User Guide. .RE .TP -.I WINEDLLPATH +.B WINEDLLPATH Specifies the path(s) in which to search for builtin dlls and Winelib applications. This is a list of directories separated by ":". In addition to any directory specified in -.IR WINEDLLPATH , +.BR WINEDLLPATH , Wine will also look in -.BR @dlldir@ . +.IR @dlldir@ . .TP -.I WINEDLLOVERRIDES +.B WINEDLLOVERRIDES Defines the override type and load order of dlls used in the loading process for any dll. There are currently two types of libraries that can be loaded -into a process' address space: native windows dlls -.RI ( native ), -.B wine -internal dlls -.RI ( builtin ). +into a process address space: native windows dlls +.RI ( native ") and Wine internal dlls (" builtin ). The type may be abbreviated with the first letter of the type -.RI ( n ", " b ). +.RI ( n " or " b ). The library may also be disabled (''). Each sequence of orders must be separated by commas. .RS .PP @@ -181,9 +175,9 @@ different libraries by separating the entries by ";". The load order for a 16-bit dll is always defined by the load order of the 32-bit dll that contains it (which can be identified by looking at the symbolic link of the 16-bit .dll.so file). For instance if -ole32.dll is configured as builtin, storage.dll will be loaded as -builtin too, since the 32-bit ole32.dll contains the 16-bit -storage.dll. +\fIole32.dll\fR is configured as builtin, \fIstorage.dll\fR will be loaded as +builtin too, since the 32-bit \fIole32.dll\fR contains the 16-bit +\fIstorage.dll\fR. .PP Examples: .TP @@ -195,16 +189,16 @@ the builtin version if the native load fails. WINEDLLOVERRIDES="comdlg32,shell32=n;c:\(rs\(rsfoo\(rs\(rsbar\(rs\(rsbaz=b" .br Try to load the libraries comdlg32 and shell32 as native windows dlls. Furthermore, if -an application request to load c:\(rsfoo\(rsbar\(rsbaz.dll load the builtin library baz. +an application request to load \fIc:\(rsfoo\(rsbar\(rsbaz.dll\fR load the builtin library \fIbaz\fR. .TP WINEDLLOVERRIDES="comdlg32=b,n;shell32=b;comctl32=n;oleaut32=" .br Try to load comdlg32 as builtin first and try the native version if the builtin load fails; load shell32 always as builtin and comctl32 -always as native. Oleaut32 will be disabled. +always as native; oleaut32 will be disabled. .RE .TP -.I WINEARCH +.B WINEARCH Specifies the Windows architecture to support. It can be set either to .B win32 (support only 32-bit applications), or to @@ -214,76 +208,64 @@ Specifies the Windows architecture to support. It can be set either to The architecture supported by a given Wine prefix is set at prefix creation time and cannot be changed afterwards. When running with an existing prefix, Wine will refuse to start if -.I WINEARCH +.B WINEARCH doesn't match the prefix architecture. .TP -.I DISPLAY +.B DISPLAY Specifies the X11 display to use. .TP -OSS sound driver configuration variables +OSS sound driver configuration variables: .TP -.I AUDIODEV +.B AUDIODEV Set the device for audio input / output. Default -.BR /dev/dsp . +.IR /dev/dsp . .TP -.I MIXERDEV +.B MIXERDEV Set the device for mixer controls. Default -.BR /dev/mixer . +.IR /dev/mixer . .TP -.I MIDIDEV +.B MIDIDEV Set the MIDI (sequencer) device. Default -.BR /dev/sequencer . +.IR /dev/sequencer . .SH FILES .TP .I @bindir@/wine -The -.B wine -program loader. +The Wine program loader. .TP .I @bindir@/wineconsole -The -.B wine -program loader for CUI (console) applications. +The Wine program loader for CUI (console) applications. .TP .I @bindir@/wineserver -The -.B wine -server -.TP +The Wine server +.TP .I @bindir@/winedbg -The -.B wine -debugger -.TP +The Wine debugger +.TP .I @dlldir@ -Directory containing -.BR wine -shared libraries +Directory containing Wine shared libraries .TP .I $WINEPREFIX/dosdevices Directory containing the DOS device mappings. Each file in that directory is a symlink to the Unix device file implementing a given -device. For instance, if COM1 is mapped to /dev/ttyS0 you'd have a -symlink of the form $WINEPREFIX/dosdevices/com1 -> /dev/ttyS0. +device. For instance, if COM1 is mapped to \fI/dev/ttyS0\fR you'd have a +symlink of the form \fI$WINEPREFIX/dosdevices/com1\fR -> \fI/dev/ttyS0\fR. .br DOS drives are also specified with symlinks; for instance if drive D: -corresponds to the CDROM mounted at /mnt/cdrom, you'd have a symlink -$WINEPREFIX/dosdevices/d: -> /mnt/cdrom. The Unix device corresponding +corresponds to the CDROM mounted at \fI/mnt/cdrom\fR, you'd have a symlink +\fI$WINEPREFIX/dosdevices/d:\fR -> \fI/mnt/cdrom\fR. The Unix device corresponding to a DOS drive can be specified the same way, except with '::' instead of ':'. So for the previous example, if the CDROM device is mounted -from /dev/hdc, the corresponding symlink would be -$WINEPREFIX/dosdevices/d:: -> /dev/hdc. +from \fI/dev/hdc\fR, the corresponding symlink would be +\fI$WINEPREFIX/dosdevices/d::\fR -> \fI/dev/hdc\fR. .SH AUTHORS -.B wine -is available thanks to the work of many developers. For a listing -of the authors, please see the file -.B AUTHORS +Wine is available thanks to the work of many developers. For a listing +of the authors, please see the file +.I AUTHORS in the top-level directory of the source distribution. .SH COPYRIGHT -.B wine -can be distributed under the terms of the LGPL license. A copy of the +Wine can be distributed under the terms of the LGPL license. A copy of the license is in the file -.B COPYING.LIB +.I COPYING.LIB in the top-level directory of the source distribution. .SH BUGS .PP

1 0

Frédéric Delanoy : server: Fix manpage formatting .
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: 426bb06baa81e9c603eb5dee502b5f8d782d04b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426bb06baa81e9c603eb5dee5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 19 14:59:13 2013 +0200 server: Fix manpage formatting. --- server/wineserver.man.in | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/wineserver.man.in b/server/wineserver.man.in index 38cb5ee..0837bac 100644 --- a/server/wineserver.man.in +++ b/server/wineserver.man.in @@ -2,7 +2,8 @@ .SH NAME wineserver \- the Wine server .SH SYNOPSIS -.BI wineserver\ [options] +.B wineserver +.RI [ options ] .SH DESCRIPTION .B wineserver is a daemon process that provides to Wine roughly the same services @@ -15,7 +16,7 @@ useful to start \fBwineserver\fR explicitly with different options, as explained below. .SH OPTIONS .TP -\fB\-d\fI[n]\fR, \fB--debug\fI[=n] +\fB\-d\fR[\fIn\fR], \fB--debug\fR[\fB=\fIn\fR] Set the debug level to .IR n . 0 means no debugging information, 1 is the normal level, and 2 is for @@ -33,7 +34,7 @@ instance when running it under a debugger. .BR \-h ", " --help Display a help message. .TP -\fB\-k\fI[n]\fR, \fB--kill\fI[=n] +\fB\-k\fR[\fIn\fR], \fB--kill\fR[\fB=\fIn\fR] Kill the currently running .BR wineserver , optionally by sending signal \fIn\fR. If no signal is specified, sends @@ -41,7 +42,7 @@ a SIGINT first and then a SIGKILL. The instance of \fBwineserver\fR that is killed is selected based on the WINEPREFIX environment variable. .TP -\fB\-p\fI[n]\fR, \fB--persistent\fI[=n] +\fB\-p\fR[\fIn\fR], \fB--persistent\fR[\fB=\fIn\fR] Specify the \fBwineserver\fR persistence delay, i.e. the amount of time that the server will keep running when all client processes have terminated. This avoids the cost of shutting down and starting again

1 0

Dmitry Timoshkov : ntdll: NtAllocateVirtualMemory should fail to commit if an address range is already committed for a memory mapped file .
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: 3d759a0c69732721fab2881e484bf716c196dfe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d759a0c69732721fab2881e4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 19 14:01:16 2013 +0900 ntdll: NtAllocateVirtualMemory should fail to commit if an address range is already committed for a memory mapped file. --- dlls/kernel32/tests/loader.c | 16 +++++++++------- dlls/kernel32/tests/virtual.c | 14 ++++++-------- dlls/ntdll/virtual.c | 1 + 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ef1cde4..0018d67 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -396,12 +396,13 @@ static void test_Loader(void) SetLastError(0xdeadbeef); ptr = VirtualAlloc(hlib, si.dwPageSize, MEM_COMMIT, info.Protect); - /* FIXME: Remove once Wine is fixed */ - if (ptr) todo_wine ok(!ptr, "%d: VirtualAlloc should fail\n", i); - else ok(!ptr, "%d: VirtualAlloc should fail\n", i); + /* FIXME: Remove once Wine is fixed */ + if (info.Protect == PAGE_WRITECOPY || info.Protect == PAGE_EXECUTE_WRITECOPY) todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + else + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); SetLastError(0xdeadbeef); size = VirtualQuery((char *)hlib + info.RegionSize, &info, sizeof(info)); @@ -484,14 +485,15 @@ todo_wine SetLastError(0xdeadbeef); ptr = VirtualAlloc((char *)hlib + section.VirtualAddress, si.dwPageSize, MEM_COMMIT, info.Protect); - /* FIXME: Remove once Wine is fixed */ - if (ptr) todo_wine ok(!ptr, "%d: VirtualAlloc should fail\n", i); - else ok(!ptr, "%d: VirtualAlloc should fail\n", i); + /* FIXME: Remove once Wine is fixed */ + if (info.Protect == PAGE_WRITECOPY || info.Protect == PAGE_EXECUTE_WRITECOPY) todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_ADDRESS, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); - + else + ok(GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_ADDRESS, + "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); } SetLastError(0xdeadbeef); diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index e605242..99d3286 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1923,14 +1923,13 @@ static void test_CreateFileMapping_protection(void) SetLastError(0xdeadbeef); ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); + ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); /* FIXME: remove once Wine is fixed */ if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) - ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); - else -todo_wine - ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + else + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); SetLastError(0xdeadbeef); ret = VirtualProtect(base, si.dwPageSize, td[i].prot, &old_prot); @@ -2427,14 +2426,13 @@ static void test_mapping(void) /*trace("map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]);*/ SetLastError(0xdeadbeef); ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, page_prot[k]); + ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); /* FIXME: remove once Wine is fixed */ if (page_prot[k] == PAGE_WRITECOPY || page_prot[k] == PAGE_EXECUTE_WRITECOPY) - ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); - else -todo_wine - ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + else + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); } UnmapViewOfFile(base); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 121071f..3ae1f48 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1974,6 +1974,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ else /* commit the pages */ { if (!(view = VIRTUAL_FindView( base, size ))) status = STATUS_NOT_MAPPED_VIEW; + else if (view->mapping && (view->protect & VPROT_COMMITTED)) status = STATUS_ALREADY_COMMITTED; else if (!VIRTUAL_SetProt( view, base, size, vprot )) status = STATUS_ACCESS_DENIED; else if (view->mapping && !(view->protect & VPROT_COMMITTED)) {

1 0

Alexandre Julliard : ntdll: Simplify detach sequence now that there is no possible race on process exit .
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: 1c11770159c464ab0cfb65c81ab8262db6ffb3cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c11770159c464ab0cfb65c81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 19 12:13:09 2013 +0200 ntdll: Simplify detach sequence now that there is no possible race on process exit. --- dlls/ntdll/loader.c | 59 ++++++++++++++++++++------------------------------ 1 files changed, 24 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9642f62..c4d7487 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1163,16 +1163,13 @@ static void attach_implicitly_loaded_dlls( LPVOID reserved ) * process_detach * * Send DLL process detach notifications. See the comment about calling - * sequence at process_attach. Unless the bForceDetach flag - * is set, only DLLs with zero refcount are notified. + * sequence at process_attach. */ -static void process_detach( BOOL bForceDetach, LPVOID lpReserved ) +static void process_detach(void) { PLIST_ENTRY mark, entry; PLDR_MODULE mod; - RtlEnterCriticalSection( &loader_section ); - if (bForceDetach) process_detaching = 1; mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList; do { @@ -1183,21 +1180,19 @@ static void process_detach( BOOL bForceDetach, LPVOID lpReserved ) /* Check whether to detach this DLL */ if ( !(mod->Flags & LDR_PROCESS_ATTACHED) ) continue; - if ( mod->LoadCount && !bForceDetach ) + if ( mod->LoadCount && !process_detaching ) continue; /* Call detach notification */ mod->Flags &= ~LDR_PROCESS_ATTACHED; MODULE_InitDLL( CONTAINING_RECORD(mod, WINE_MODREF, ldr), - DLL_PROCESS_DETACH, lpReserved ); + DLL_PROCESS_DETACH, ULongToPtr(process_detaching) ); /* Restart at head of WINE_MODREF list, as entries might have been added and/or removed while performing the call ... */ break; } } while (entry != mark); - - RtlLeaveCriticalSection( &loader_section ); } /************************************************************************* @@ -1215,7 +1210,6 @@ NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved ) /* don't do any attach calls if process is exiting */ if (process_detaching) return STATUS_SUCCESS; - /* FIXME: there is still a race here */ RtlEnterCriticalSection( &loader_section ); @@ -2394,7 +2388,8 @@ BOOLEAN WINAPI RtlDllShutdownInProgress(void) void WINAPI LdrShutdownProcess(void) { TRACE("()\n"); - process_detach( TRUE, (LPVOID)1 ); + process_detaching = 1; + process_detach(); } /****************************************************************** @@ -2410,7 +2405,6 @@ void WINAPI LdrShutdownThread(void) /* don't do any detach calls if process is exiting */ if (process_detaching) return; - /* FIXME: there is still a race here */ RtlEnterCriticalSection( &loader_section ); @@ -2537,41 +2531,36 @@ static void MODULE_DecRefCount( WINE_MODREF *wm ) */ NTSTATUS WINAPI LdrUnloadDll( HMODULE hModule ) { + WINE_MODREF *wm; NTSTATUS retv = STATUS_SUCCESS; + if (process_detaching) return retv; + TRACE("(%p)\n", hModule); RtlEnterCriticalSection( &loader_section ); - /* if we're stopping the whole process (and forcing the removal of all - * DLLs) the library will be freed anyway - */ - if (!process_detaching) + free_lib_count++; + if ((wm = get_modref( hModule )) != NULL) { - WINE_MODREF *wm; - - free_lib_count++; - if ((wm = get_modref( hModule )) != NULL) - { - TRACE("(%s) - START\n", debugstr_w(wm->ldr.BaseDllName.Buffer)); + TRACE("(%s) - START\n", debugstr_w(wm->ldr.BaseDllName.Buffer)); - /* Recursively decrement reference counts */ - MODULE_DecRefCount( wm ); + /* Recursively decrement reference counts */ + MODULE_DecRefCount( wm ); - /* Call process detach notifications */ - if ( free_lib_count <= 1 ) - { - process_detach( FALSE, NULL ); - MODULE_FlushModrefs(); - } - - TRACE("END\n"); + /* Call process detach notifications */ + if ( free_lib_count <= 1 ) + { + process_detach(); + MODULE_FlushModrefs(); } - else - retv = STATUS_DLL_NOT_FOUND; - free_lib_count--; + TRACE("END\n"); } + else + retv = STATUS_DLL_NOT_FOUND; + + free_lib_count--; RtlLeaveCriticalSection( &loader_section );

1 0

Dmitry Timoshkov : gdiplus: Store graphics clipping region in device coordinates.
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: 14f34c15d1ed5ff3a58b9505637574ade6eaef65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f34c15d1ed5ff3a58b95056… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 19 11:34:42 2013 +0900 gdiplus: Store graphics clipping region in device coordinates. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 88 ++++++++++++++++++++++++++++++++++++---- dlls/gdiplus/tests/graphics.c | 26 ++---------- 3 files changed, 85 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14f34c15d1ed5ff3a58b9…

1 0

Jacek Caban : wininet: Ignore missing status text in response headers.
by Alexandre Julliard July 19, 2013

July 19, 2013

Module: wine Branch: master Commit: 10389b272d427114e613baee98ec9ed68c0e1ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10389b272d427114e613baee9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 19 12:02:18 2013 +0200 wininet: Ignore missing status text in response headers. --- dlls/wininet/http.c | 14 +++++++++----- dlls/wininet/tests/http.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a0e4973..03fbf10 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -141,6 +141,8 @@ static const WCHAR szVia[] = { 'V','i','a',0 }; static const WCHAR szWarning[] = { 'W','a','r','n','i','n','g',0 }; static const WCHAR szWWW_Authenticate[] = { 'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0 }; +static const WCHAR emptyW[] = {0}; + #define HTTP_REFERER szReferer #define HTTP_ACCEPT szAccept #define HTTP_USERAGENT szUser_Agent @@ -3874,6 +3876,8 @@ BOOL WINAPI HttpQueryInfoA(HINTERNET hHttpRequest, DWORD dwInfoLevel, DWORD len; WCHAR* bufferW; + TRACE("%p %x\n", hHttpRequest, dwInfoLevel); + if((dwInfoLevel & HTTP_QUERY_FLAG_NUMBER) || (dwInfoLevel & HTTP_QUERY_FLAG_SYSTEMTIME)) { @@ -5857,9 +5861,8 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) /* split the status code from the status text */ status_text = strchrW( status_code, ' ' ); - if( !status_text ) - goto lend; - *status_text++=0; + if( status_text ) + *status_text++=0; request->status_code = atoiW(status_code); @@ -5891,11 +5894,12 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) heap_free(request->statusText); request->version = heap_strdupW(buffer); - request->statusText = heap_strdupW(status_text); + request->statusText = heap_strdupW(status_text ? status_text : emptyW); /* Restore the spaces */ *(status_code-1) = ' '; - *(status_text-1) = ' '; + if (status_text) + *(status_text-1) = ' '; /* Parse each response line */ do diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c3dd7dd..6022955 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3590,6 +3590,20 @@ static const http_status_test_t http_status_tests[] = { "\r\nx", 404, "Fail" + }, + { + "HTTP/1.1 200\r\n" + "Content-Length: 1\r\n" + "\r\nx", + 200, + "" + }, + { + "HTTP/1.1 410 \r\n" + "Content-Length: 1\r\n" + "\r\nx", + 410, + "" } };

1 0