wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Andrew Eikum : oleaut32: Don't clear BSTR size.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: e51298c5c52c0ac8c684e71e5ccfb938fd7cf636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51298c5c52c0ac8c684e71e5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 5 13:38:21 2016 -0600 oleaut32: Don't clear BSTR size. The size is used during cache lookup. Clearing it will break lookup and prevent detection of double-freeing when warn+heap is enabled. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3bc2ec33712ed57abf92b8014dda334cb9046d13) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/oleaut.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 0352215..a4a1775 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -280,7 +280,6 @@ void WINAPI SysFreeString(BSTR str) if(WARN_ON(heap)) { unsigned n = bstr_alloc_size(bstr->size) / sizeof(DWORD) - 1; - bstr->size = ARENA_FREE_FILLER; for(i=0; i<n; i++) bstr->u.dwptr[i] = ARENA_FREE_FILLER; }

1 0

André Hentschel : winemaker: Markup fixes in German translation.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 85d6104ce30ea93de9bd17fe4a137bc61888d195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d6104ce30ea93de9bd17fe4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 8 21:51:10 2016 +0100 winemaker: Markup fixes in German translation. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 154d024f8db9017ddf9ca28f0022554ac919eb5c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winemaker/winemaker.de.UTF-8.man.in | 83 +++++++++++++++---------------- 1 file changed, 41 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85d6104ce30ea93de9bd1…

1 0

Frédéric Delanoy : winemaker: Markup fixes in French translation.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 9a3abae50c2f87e70463be864db0a6e8051c272c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a3abae50c2f87e70463be864… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Mar 6 02:30:28 2016 +0100 winemaker: Markup fixes in French translation. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1bd60414c8f07461447b53e98dbc38001a04e6dd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winemaker/winemaker.fr.UTF-8.man.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/winemaker/winemaker.fr.UTF-8.man.in b/tools/winemaker/winemaker.fr.UTF-8.man.in index 8e454ae..75ed9fd 100644 --- a/tools/winemaker/winemaker.fr.UTF-8.man.in +++ b/tools/winemaker/winemaker.fr.UTF-8.man.in @@ -29,12 +29,11 @@ winemaker \- générer une infrastructure de construction pour la compilation de .br [ .BR "--generated-files " "] [ " "--nogenerated-files " "] -] .br [ .BR "--wine32 " "] .br -.IR " répertoire_de_travail" "| " "fichier_projet" "| " "fichier_espace_de_travail" +.IR " répertoire_de_travail" " | " "fichier_projet" " | " "fichier_espace_de_travail" .SH DESCRIPTION .PP @@ -49,7 +48,7 @@ convertis en majuscules durant le transfert. .PP -\ convertir les fins de ligne DOS en fins de ligne UNIX (CRLF vers LF). .PP --\ balayer les directives d'inclusion et les références aux fichiers +-\ parcourir les directives d'inclusion et les références aux fichiers de ressources pour y remplacer les backslashs par des slashs. .PP -\ durant l'étape ci-dessus, @@ -182,7 +181,7 @@ L'ensemble standard de bibliothèques est : \fIodbc32.dll\fR, \fIodbccp32.dll\f \fIoleaut32.dll\fR et \fIwinspool.drv\fR. .TP .B --nomsvcrt -Définir certaines options afin que winegcc n'utilise pas +Définir certaines options afin que \fBwinegcc\fR n'utilise pas msvcrt durant la compilation. Utilisez cette option si certains fichiers cpp incluent \fI<string>\fR. .TP @@ -192,7 +191,7 @@ Utiliser le mode interactif. Dans ce mode, demandera de confirmer la liste de cibles pour chaque répertoire, et ensuite de fournir des options spécifiques de répertoire et/ou de cible. .TP -.BR --single-target " nom" +.BI --single-target " nom" Spécifier qu'il n'y a qu'une seule cible, appelée \fInom\fR. .TP .B --generated-files

1 0

Hans Leidekker : msiexec: Fix manpage markup for repair and logging modifiers.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: dadf14e752620026441ebd53094f3c960b8fd332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dadf14e752620026441ebd530… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 3 11:42:02 2016 +0100 msiexec: Fix manpage markup for repair and logging modifiers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8d4ac88a6b18fa0655e92d292fa847021a55bfc3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/msiexec/msiexec.man.in | 50 ++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/programs/msiexec/msiexec.man.in b/programs/msiexec/msiexec.man.in index 23b3b58..e7c3798 100644 --- a/programs/msiexec/msiexec.man.in +++ b/programs/msiexec/msiexec.man.in @@ -24,25 +24,25 @@ Same as \fB/x\fR. \fR[\fBp\fR|\fBo\fR|\fBe\fR|\fBd\fR|\fBc\fR|\fBa\fR|\fBu\fR|\fBm\fR|\fBs\fR|\fBv\fR]\ \ \fR{\fIpackage\fR|\fIproductcode\fR} Repair an installation. Default options are \'omus\' -.IP "\fBlp\fR" +.IP "\fBp\fR" Reinstall the file if it is missing. -.IP "\fBlo\fR" +.IP "\fBo\fR" Reinstall the file if it is missing or if any older version is installed. -.IP "\fBle\fR" +.IP "\fBe\fR" Reinstall the file if it is missing, or if the installed version is equal or older. -.IP "\fBld\fR" +.IP "\fBd\fR" Reinstall the file if it is missing or a different version is installed. -.IP "\fBlc\fR" +.IP "\fBc\fR" Reinstall the file if it is missing or the checksum does not match. -.IP "\fBla\fR" +.IP "\fBa\fR" Reinstall all files. -.IP "\fBlu\fR" +.IP "\fBu\fR" Rewrite all required user registry entries. -.IP "\fBlm\fR" +.IP "\fBm\fR" Rewrite all required machine registry entries. -.IP "\fBls\fR" +.IP "\fBs\fR" Overwrite any conflicting shortcuts. -.IP "\fBlv\fR" +.IP "\fBv\fR" Recache the local installation package from the source installation package. .SH PATCHING .IP \fB/p\ \fR{\fIpatch\fR}\ \fR[\fIproperty\fR=\fIfoobar\fR] @@ -65,35 +65,35 @@ Shows a full UI. [\fBi\fR|\fBw\fR|\fBe\fR|\fBa\fR|\fBr\fR|\fBu\fR|\fBc\fR|\fBm\fR|\fBo\fR|\fBp\fR|\fBv\fR]\ [\fB+\fR|\fB!\fR]\ {\fIlogfile\fR} Enable logging to \fIlogfile\fR. Defaults are \'iwearmo\'. -.IP "\fBl*\fR" +.IP "\fB*\fR" Enable all logging options except \'v\' and \'x\'. -.IP "\fBli\fR" +.IP "\fBi\fR" Log status messages. -.IP "\fBlw\fR" +.IP "\fBw\fR" Log nonfatal warnings. -.IP "\fBle\fR" +.IP "\fBe\fR" Log all error messages. -.IP "\fBla\fR" +.IP "\fBa\fR" Log start of actions. -.IP "\fBlr\fR" +.IP "\fBr\fR" Log action specifc records. -.IP "\fBlu\fR" +.IP "\fBu\fR" Log user requests. -.IP "\fBlc\fR" +.IP "\fBc\fR" Log initial UI parameters. -.IP "\fBlm\fR" +.IP "\fBm\fR" Log out of memory errors. -.IP "\fBlo\fR" +.IP "\fBo\fR" Log out of diskspace messages. -.IP "\fBlp \fR" +.IP "\fBp \fR" Log terminal properties. -.IP "\fBlv \fR" +.IP "\fBv \fR" Verbose logging. -.IP "\fBlx \fR" +.IP "\fBx \fR" Log extra debugging messages. -.IP "\fBl+ \fR" +.IP "\fB+ \fR" Append logging to existing file. -.IP "\fBl! \fR" +.IP "\fB! \fR" Flush each line to log. .SH OTHER OPTIONS .IP \fB/h

1 0

Marcus Meissner : manpages: Markup fixes.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 32dbcdfcbbea499a7503407c1041d38fbb7c3f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32dbcdfcbbea499a7503407c1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Mar 2 09:24:34 2016 +0100 manpages: Markup fixes. Reported by Eric S. Raymond. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0d06ebf5fb515e19cd9ec951dd9e49f6e678b35c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/msiexec/msiexec.man.in | 50 ++++++++++++++++++++-------------------- programs/winedbg/winedbg.man.in | 2 +- tools/winemaker/winemaker.man.in | 1 - 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/programs/msiexec/msiexec.man.in b/programs/msiexec/msiexec.man.in index 83328ae..23b3b58 100644 --- a/programs/msiexec/msiexec.man.in +++ b/programs/msiexec/msiexec.man.in @@ -24,25 +24,25 @@ Same as \fB/x\fR. \fR[\fBp\fR|\fBo\fR|\fBe\fR|\fBd\fR|\fBc\fR|\fBa\fR|\fBu\fR|\fBm\fR|\fBs\fR|\fBv\fR]\ \ \fR{\fIpackage\fR|\fIproductcode\fR} Repair an installation. Default options are \'omus\' -.IP "\flp\fR" +.IP "\fBlp\fR" Reinstall the file if it is missing. -.IP "\flo\fR" +.IP "\fBlo\fR" Reinstall the file if it is missing or if any older version is installed. -.IP "\fle\fR" +.IP "\fBle\fR" Reinstall the file if it is missing, or if the installed version is equal or older. -.IP "\fld\fR" +.IP "\fBld\fR" Reinstall the file if it is missing or a different version is installed. -.IP "\flc\fR" +.IP "\fBlc\fR" Reinstall the file if it is missing or the checksum does not match. -.IP "\fla\fR" +.IP "\fBla\fR" Reinstall all files. -.IP "\flu\fR" +.IP "\fBlu\fR" Rewrite all required user registry entries. -.IP "\flm\fR" +.IP "\fBlm\fR" Rewrite all required machine registry entries. -.IP "\fls\fR" +.IP "\fBls\fR" Overwrite any conflicting shortcuts. -.IP "\flv\fR" +.IP "\fBlv\fR" Recache the local installation package from the source installation package. .SH PATCHING .IP \fB/p\ \fR{\fIpatch\fR}\ \fR[\fIproperty\fR=\fIfoobar\fR] @@ -65,35 +65,35 @@ Shows a full UI. [\fBi\fR|\fBw\fR|\fBe\fR|\fBa\fR|\fBr\fR|\fBu\fR|\fBc\fR|\fBm\fR|\fBo\fR|\fBp\fR|\fBv\fR]\ [\fB+\fR|\fB!\fR]\ {\fIlogfile\fR} Enable logging to \fIlogfile\fR. Defaults are \'iwearmo\'. -.IP "\fl*\fR" +.IP "\fBl*\fR" Enable all logging options except \'v\' and \'x\'. -.IP "\fli\fR" +.IP "\fBli\fR" Log status messages. -.IP "\flw\fR" +.IP "\fBlw\fR" Log nonfatal warnings. -.IP "\fle\fR" +.IP "\fBle\fR" Log all error messages. -.IP "\fla\fR" +.IP "\fBla\fR" Log start of actions. -.IP "\flr\fR" +.IP "\fBlr\fR" Log action specifc records. -.IP "\flu\fR" +.IP "\fBlu\fR" Log user requests. -.IP "\flc\fR" +.IP "\fBlc\fR" Log initial UI parameters. -.IP "\flm\fR" +.IP "\fBlm\fR" Log out of memory errors. -.IP "\flo\fR" +.IP "\fBlo\fR" Log out of diskspace messages. -.IP "\flp \fR" +.IP "\fBlp \fR" Log terminal properties. -.IP "\flv \fR" +.IP "\fBlv \fR" Verbose logging. -.IP "\flx \fR" +.IP "\fBlx \fR" Log extra debugging messages. -.IP "\fl+ \fR" +.IP "\fBl+ \fR" Append logging to existing file. -.IP "\fl! \fR" +.IP "\fBl! \fR" Flush each line to log. .SH OTHER OPTIONS .IP \fB/h diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index d6e5dc9..d107166 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -163,7 +163,7 @@ Adds a breakpoint at the line \fIN\fR inside symbol \fIid\fR. .IP \fBbreak\ \fIN\fR Adds a breakpoint at line \fIN\fR of current source file. .IP \fBbreak\fR -Adds a breakpoint at current \f$PC\fR address. +Adds a breakpoint at current \fB$PC\fR address. .IP \fBwatch\ *\ \fIN\fR Adds a watch command (on write) at address \fIN\fR (on 4 bytes). .IP \fBwatch\ \fIid\fR diff --git a/tools/winemaker/winemaker.man.in b/tools/winemaker/winemaker.man.in index 5014cdd..9d03e65 100644 --- a/tools/winemaker/winemaker.man.in +++ b/tools/winemaker/winemaker.man.in @@ -29,7 +29,6 @@ winemaker \- generate a build infrastructure for compiling Windows programs on U .br [ .BR "--generated-files " "] [ " "--nogenerated-files " "] -] .br [ .BR "--wine32 " "]

1 0

Jens Reyer : winemaker: Fix macro-not-defined errors from man.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 6ea8b64d23eb1da71a51e9d42450cfb945f894f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea8b64d23eb1da71a51e9d42… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Tue Mar 1 19:49:42 2016 +0100 winemaker: Fix macro-not-defined errors from man. ' characters at the start of a line indicate a groff command. If used in error, the affected lines get ignored. Therefore add a zero-width space and reformat another paragraph to keep the literal meaning. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 93fc6826c210ebb3e8ee11207d39515b954858cb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winemaker/winemaker.de.UTF-8.man.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winemaker/winemaker.de.UTF-8.man.in b/tools/winemaker/winemaker.de.UTF-8.man.in index 2446a4f..e4df360 100644 --- a/tools/winemaker/winemaker.de.UTF-8.man.in +++ b/tools/winemaker/winemaker.de.UTF-8.man.in @@ -58,7 +58,7 @@ im Includepfad suchen und die entsprechende Zeile, falls nötig, mit der korrekt Groß-/Kleinschreibweise austauschen. .PP - Winemaker wird ebenso andere, exotischere Probleme wie die Benutzung von -'#pragma pack', 'afxres.h' in nicht-MFC-Projekten und mehr untersuchen. +\&'#pragma pack', 'afxres.h' in nicht-MFC-Projekten und mehr untersuchen. Sollte etwas ungwöhnliches vorkommen, wird Winemaker Sie warnen. .PP - Winemaker kann eine ganze Verzeichnisstruktur auf einmal durchsuchen, @@ -198,9 +198,9 @@ $ winemaker --lower-uppercase -DSTRICT . Damit scannt Winemaker das aktuelle Verzeichnis und die Unterverzeichnisse nach Quellcodedateien. Jede Datei und jedes Verzeichnis, das ganz in Großbuchstaben geschrieben ist, wird in Kleinbuchstaben umbenannt. Danach werden alle Quellcodedateien -an die Kompilierung mit Winelib angepasst und Makefiles erzeugt. -'-DSTRICT' gibt an, dass das STRICT-Makro gesetzt sein muss, um diesen Quellcode -zu kompilieren. Letztendlich wird Winemaker die globale Makefile erzeugen. +an die Kompilierung mit Winelib angepasst und Makefiles erzeugt. '-DSTRICT' gibt +an, dass das STRICT-Makro gesetzt sein muss, um diesen Quellcode zu kompilieren. +Letztendlich wird Winemaker die globale Makefile erzeugen. .PP Der nächste Schritt wäre dann: .PP

1 0

Jens Reyer : loader: Fix macro-not-defined error from man.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: d30f71fed810f3369c39f2e14aa2dea7ce09df69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30f71fed810f3369c39f2e14… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Tue Mar 1 19:49:41 2016 +0100 loader: Fix macro-not-defined error from man. ' characters at the start of a line indicate a groff command. If used in error, the affected lines get ignored. Therefore reformat the paragraph to keep the literal meaning. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 486194e41d23b9abaf30d322bf13cdc1bf72920d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.pl.UTF-8.man.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.pl.UTF-8.man.in b/loader/wine.pl.UTF-8.man.in index 4aebf68..1718d65 100644 --- a/loader/wine.pl.UTF-8.man.in +++ b/loader/wine.pl.UTF-8.man.in @@ -263,8 +263,8 @@ symboliczene dowiązanie w formie $WINEPREFIX/dosdevices/com1 -> /dev/ttyS0. Napędy DOS również są określone przez dowiązania symboliczne; Dla przykładu jeżeli napęd D: odpowiadałby napędowi CDROM zamontowanemu w /mnt/cdrom, miałbyś dowiązanie symboliczne $WINEPREFIX/dosdevices/d: -> /mnt/cdrom. Urządzenia Uniksowe odpowiadające -napędom DOS mogą być określone w ten sam sposób, z użyciem '::' zamiast -':'. Tak więc dla poprzedniego przykładu, jeżeli urządzenie CDROM byłoby zamontowane +napędom DOS mogą być określone w ten sam sposób, z użyciem '::' zamiast ':'. +Tak więc dla poprzedniego przykładu, jeżeli urządzenie CDROM byłoby zamontowane z /dev/hdc, to odpowiadające dowiązanie symboliczne wyglądałoby następująco $WINEPREFIX/dosdevices/d:: -> /dev/hdc. .SH AUTORZY

1 0

Miklós Máté : winex11: Add 1280x960 resolution.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 574d17a0640e6ee9d70d1c272cd96ddddd435c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=574d17a0640e6ee9d70d1c272… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Tue Feb 23 18:37:30 2016 +0100 winex11: Add 1280x960 resolution. This enables high resolution setting in Anachronox, when Wine is configured to emulate a virtual desktop. The game only supports 640x480 and 1280x960. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c0219a73848245d5f3b85c79330b2bb1792df230) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/desktop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 603e19f..2d8c039 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -37,8 +37,8 @@ static unsigned int dd_mode_count; static unsigned int max_width; static unsigned int max_height; -static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1400, 1600}; -static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 1024, 1050, 1200}; +static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; +static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; #define NUM_DESKTOP_MODES (sizeof(widths) / sizeof(widths[0])) #define _NET_WM_STATE_REMOVE 0

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayAccessData()/ SafeArrayUnaccessData().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 336bc46c10c621a25a079f44e38aa3d8377bc5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=336bc46c10c621a25a079f44e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 14 23:34:17 2016 +0300 ole2disp: Implement SafeArrayAccessData()/SafeArrayUnaccessData(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cfbac8d2ed4b79b42952e9cc99f656cfe967088a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 43 +++++++++++++++++++++++++++++---- dlls/ole2disp.dll16/ole2disp.dll16.spec | 4 +-- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index af6f03c..d61b5e8 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -89,6 +89,15 @@ static ULONG safearray_getcellcount(const SAFEARRAY16 *sa) return cells; } +static HRESULT safearray_lock(SAFEARRAY16 *sa) +{ + if (sa->cLocks == 0xffff) + return E_UNEXPECTED; + + sa->cLocks++; + return S_OK; +} + /****************************************************************************** * SafeArrayGetDim [OLE2DISP.17] */ @@ -117,11 +126,7 @@ HRESULT WINAPI SafeArrayLock16(SAFEARRAY16 *sa) if (!sa) return E_INVALIDARG16; - if (sa->cLocks == 0xffff) - return E_UNEXPECTED; - - sa->cLocks++; - return S_OK; + return safearray_lock(sa); } /****************************************************************************** @@ -142,6 +147,34 @@ HRESULT WINAPI SafeArrayUnlock16(SAFEARRAY16 *sa) } /****************************************************************************** + * SafeArrayAccessData [OLE2DISP.23] + */ +HRESULT WINAPI SafeArrayAccessData16(SAFEARRAY16 *sa, SEGPTR *data) +{ + HRESULT hr; + + TRACE("(%p, %p)\n", sa, data); + + /* arguments are not tested, it crashes if any of them is NULL */ + + hr = safearray_lock(sa); + if (FAILED(hr)) + return hr; + + *data = sa->pvData; + return S_OK; +} + +/****************************************************************************** + * SafeArrayUnaccessData [OLE2DISP.24] + */ +HRESULT WINAPI SafeArrayUnaccessData16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + return SafeArrayUnlock16(sa); +} + +/****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index b0db920..4ee52e1 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -20,8 +20,8 @@ 20 stub SAFEARRAYGETLBOUND 21 pascal SafeArrayLock(ptr) SafeArrayLock16 22 pascal SafeArrayUnlock(ptr) SafeArrayUnlock16 -23 stub SAFEARRAYACCESSDATA -24 stub SAFEARRAYUNACCESSDATA +23 pascal SafeArrayAccessData(ptr ptr) SafeArrayAccessData16 +24 pascal SafeArrayUnaccessData(ptr) SafeArrayUnaccessData16 25 stub SAFEARRAYGETELEMENT 26 stub SAFEARRAYPUTELEMENT 27 stub SAFEARRAYCOPY

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayLock()/SafeArrayUnlock().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 60f7af833054f1f58d215e51869e5af23a0c80d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f7af833054f1f58d215e518… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 13 22:25:56 2016 +0300 ole2disp: Implement SafeArrayLock()/SafeArrayUnlock(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2ef42bd946caa11c2248afbeb0dfc3e6d05929b0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 34 +++++++++++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 4 ++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 20b7b6c..af6f03c 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -108,6 +108,40 @@ USHORT WINAPI SafeArrayGetElemsize16(SAFEARRAY16 *sa) } /****************************************************************************** + * SafeArrayLock [OLE2DISP.21] + */ +HRESULT WINAPI SafeArrayLock16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + + if (!sa) + return E_INVALIDARG16; + + if (sa->cLocks == 0xffff) + return E_UNEXPECTED; + + sa->cLocks++; + return S_OK; +} + +/****************************************************************************** + * SafeArrayUnlock [OLE2DISP.22] + */ +HRESULT WINAPI SafeArrayUnlock16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + + if (!sa) + return E_INVALIDARG16; + + if (sa->cLocks == 0) + return E_UNEXPECTED; + + sa->cLocks--; + return S_OK; +} + +/****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index ca884a0..b0db920 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -18,8 +18,8 @@ 18 pascal -ret16 SafeArrayGetElemsize(ptr) SafeArrayGetElemsize16 19 stub SAFEARRAYGETUBOUND 20 stub SAFEARRAYGETLBOUND -21 stub SAFEARRAYLOCK -22 stub SAFEARRAYUNLOCK +21 pascal SafeArrayLock(ptr) SafeArrayLock16 +22 pascal SafeArrayUnlock(ptr) SafeArrayUnlock16 23 stub SAFEARRAYACCESSDATA 24 stub SAFEARRAYUNACCESSDATA 25 stub SAFEARRAYGETELEMENT

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016