wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

marco : The Mandriva package web adress changed
by Jeremy Newman 07 Feb '11

07 Feb '11

Module: website Branch: master Commit: f960510241adae4d9e890d8e393651a4821b43dd URL: http://source.winehq.org/git/website.git/?a=commit;h=f960510241adae4d9e890d… Author: marco <marco(a)mandrivaclub.nl> Date: Thu Feb 3 21:45:12 2011 +0100 The Mandriva package web adress changed Sourceforce changed the web adress of the files so the old link is not longer working. This patch changed the link in the different languages. kind regards, Marco Meijer >From d91677b7be6af504d6ba199c16982824152157eb Mon Sep 17 00:00:00 2001 From: Marco Meijer <marco(a)mandrivaclub.nl> Date: Fri, 28 Jan 2011 11:52:55 +0100 Subject: Mandriva package web adress changed --- templates/de/download.template | 10 +++++----- templates/en/download.template | 6 +++--- templates/fr/download.template | 7 +++---- templates/he/download.template | 4 ++-- templates/pl/download.template | 6 +++--- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 7617dce..1cfb980 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -112,13 +112,13 @@ erbeten hat, dass sie die Wine-Website hosten. </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…"> + <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Mandriva</a> - binär .rpms für Mandriva Linux 2006, 2007 und 2008. Lade das 2008.1 Package herunter, falls Du eine - 2008.1 Version von Mandriva nutzt, z.B. 2008 Spring. Lade das 2008.0 Package herunter, falls Du die erste - Mandriva Version aus 2008 nutzt.</td> + <td> <a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Mandriva</a> + binär .rpms für Mandriva Linux 2008, 2009 und 2010. Lade das 20010.2 Package herunter, falls Du eine + 2010.2 Version von Mandriva nutzt, z.B. 20010 Spring. Lade das 20010.0 Package herunter, falls Du die erste + Mandriva Version aus 20010 nutzt.</td> <td><a href="mailto:marco@mandrivaclub.nl">Marco Meijer</a></td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index 3a80f23..33b79f1 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -100,11 +100,11 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…"> + <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Download Mandriva packages</a> - - binary .rpms for Mandriva Linux 2008, 2009, and 2010. Download the 2010.1 package if your Mandriva is a 2010.1 + <td> <a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Download Mandriva packages</a> + - binary .rpms for Mandriva Linux 2008, 2009, and 2010. Download the 2010.2 package if your Mandriva is a 2010.2 release, eg. 2010 Spring. Download the 2010.0 package if your Mandriva is the first 2010 release.</td> <td><a href="mailto:marco@mandrivaclub.nl">Marco Meijer</a></td> </tr> diff --git a/templates/fr/download.template b/templates/fr/download.template index a428f89..b9aaf84 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -107,13 +107,12 @@ center;">Voyez la </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…"> + <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> - <td> <a -href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Paquets Mandriva</a> + <td> <a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Paquets Mandriva</a> - .rpm binaires pour Mandriva Linux 2008, 2009 et 2010. Téléchargez les - paquets 2010.1 si votre Mandriva est une version 2010.1, p.ex. 2010 + paquets 2010.2 si votre Mandriva est une version 2010.2, p.ex. 2010 Spring. Téléchargez les paquets 2010.0 si votre Mandriva est la première version 2010.</td> <td><a href="mailto:marco@mandrivaclub.nl">Marco Meijer</a></td> </tr> diff --git a/templates/he/download.template b/templates/he/download.template index f5d22ae..05f0a4e 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -100,10 +100,10 @@ </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…"> + <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">הורדת חבילות ל־Mandriva</a> + <td> <a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">הורדת חבילות ל־Mandriva</a> - קובצי .rpmבינריים ל־Mandriva Linux 2008, 2009 ו־2010. יש להוריד את החבילה 2010.1 אם גרסת ה־היא Mandriva שלך היא 2010.1, לדוגמה ל־2010 Spring. יש להוריד את חבילת 2010.0 אם הפצת ה־Mandriva שלך היא ההפצה הראשונה לשנת 2010.</td> <td><a href="mailto:marco@mandrivaclub.nl">Marco Meijer</a></td> diff --git a/templates/pl/download.template b/templates/pl/download.template index fd8910a..9631880 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -99,11 +99,11 @@ </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…"> + <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Pobierz paczki dla Mandriva</a> - - binarne paczki .rpm dla Mandriva Linux 2008, 2009, i 2010. Pobierz paczkę 2010.1 jeżeli wersja twojej Mandrivy to 2010.1 + <td> <a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Pobierz paczki dla Mandriva</a> + - binarne paczki .rpm dla Mandriva Linux 2008, 2009, i 2010. Pobierz paczkę 2010.2 jeżeli wersja twojej Mandrivy to 2010.2 , np. 2010 Spring. Pobierz paczkę 2010.0 jeżeli twoja Mandriva jest pierwszym wydaniem w roku 2010.</td> <td><a href="mailto:marco@mandrivaclub.nl">Marco Meijer</a></td> </tr>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.4 1.2.1 and 1.3.13
by Jeremy Newman 07 Feb '11

07 Feb '11

Module: website Branch: master Commit: 313682e0bb376a52d5be20d17eba3abc1505a91b URL: http://source.winehq.org/git/website.git/?a=commit;h=313682e0bb376a52d5be20… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Feb 4 20:38:44 2011 +0100 Polish translation for release 1.3.4 1.2.1 and 1.3.13 --- news/pl/2010100101.xml | 19 +++++++++++++++++++ news/pl/2010100801.xml | 13 +++++++++++++ news/pl/2011020401.xml | 16 ++++++++++++++++ 3 files changed, 48 insertions(+), 0 deletions(-) diff --git a/news/pl/2010100101.xml b/news/pl/2010100101.xml new file mode 100644 index 0000000..e6ba430 --- /dev/null +++ b/news/pl/2010100101.xml @@ -0,0 +1,19 @@ +<news> +<date>Październik 1, 2010</date> +<title>Wydano Wine 1.3.4</title> +<body> + Wydanie rozwojowe Wine 1.3.4 jest już dostępne. + <a href="{$root}/announce/1.3.4">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla lustrzanych okien od-prawej-do-lewej.</li> + <li>Od teraz Winelib wspiera platformę ARM.</li> + <li>Nowa wbudowana aplikacja o nazwie taskkill.exe.</li> + <li>Opracowano panel kontrolny Inetcpl.</li> + <li>AcceptEx jest od teraz zaimplementowany.</li> + <li>Ulepszone sprawdzanie bezpieczeństwa dla połączeń SSL.</li> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.4.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> diff --git a/news/pl/2010100801.xml b/news/pl/2010100801.xml new file mode 100644 index 0000000..2636130 --- /dev/null +++ b/news/pl/2010100801.xml @@ -0,0 +1,13 @@ +<news> +<date>Październik 8, 2010</date> +<title>Wydano Wine 1.2.1</title> +<body> + Poprawione wydanie Wine 1.2.1 jest już dostępne. + <a href="{$root}/announce/1.2.1">Co nowego</a> w tym wydaniu: +<ul> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.2.1.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> diff --git a/news/pl/2011020401.xml b/news/pl/2011020401.xml new file mode 100644 index 0000000..967285f --- /dev/null +++ b/news/pl/2011020401.xml @@ -0,0 +1,16 @@ +<news> +<date>Luty 4, 2011</date> +<title>Wydano Wine 1.3.13</title> +<body> + Wydanie rozwojowe Wine 1.3.13 jest już dostępne. + <a href="{$root}/announce/1.3.13">Co nowego</a> w tym wydaniu: +<ul> + <li>Narzędzia do tworzenia instalatorów MSI.</li> + <li>Ulepszenia w schowku.</li> + <li>Wsparcie dla plików po w kompilatorze wiadomości.</li> + <li>Ulepszenia w debugerze Wine.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.13.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 : French translation for release 1.3.13
by Jeremy Newman 07 Feb '11

07 Feb '11

Module: website Branch: master Commit: 216282d4ef6a0d1abc63e90c134e56c84951075e URL: http://source.winehq.org/git/website.git/?a=commit;h=216282d4ef6a0d1abc63e9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 5 02:34:54 2011 +0100 French translation for release 1.3.13 --- news/fr/2011020401.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/fr/2011020401.xml b/news/fr/2011020401.xml new file mode 100644 index 0000000..b329404 --- /dev/null +++ b/news/fr/2011020401.xml @@ -0,0 +1,19 @@ +<news> +<date>4 février 2011</date> +<title>Sortie de Wine 1.3.13</title> +<body> + La version de développement 1.3.13 de Wine est disponible. + <a href="{$root}/announce/1.3.13">Nouveautés</a> de cette version : +<ul> + <li>Outils pour la création d'installeurs MSI.</li> + <li>Améliorations du presse-papiers.</li> + <li>Prise en charge des fichiers po dans le compilateur de messages.</li> + <li>Améliorations du débogueur Wine.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.13.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.3.13 freigegeben
by Jeremy Newman 07 Feb '11

07 Feb '11

Module: website Branch: master Commit: 5d89464537397cb9a51c41a4f1f42aebd7254051 URL: http://source.winehq.org/git/website.git/?a=commit;h=5d89464537397cb9a51c41… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 4 20:30:35 2011 +0100 Wine 1.3.13 freigegeben --- news/de/2011020401.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2011020401.xml b/news/de/2011020401.xml new file mode 100644 index 0000000..ac98b9c --- /dev/null +++ b/news/de/2011020401.xml @@ -0,0 +1,16 @@ +<news> +<date>4. Februar 2011</date> +<title>Wine 1.3.13 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.13 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.13">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Werkzeuge zum erzeugen von MSI-Installer.</li> + <li>Verbesserungen an der Zwischenablage.</li> + <li>Unterstützung für po-Dateien im Message-Compiler.</li> + <li>Verbesserungen am Wine Debugger.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.13.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.13
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: website Branch: master Commit: 600ae952971d1f5995bd1eaf9f17834e4284aa03 URL: http://source.winehq.org/git/website.git/?a=commit;h=600ae952971d1f5995bd1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 20:20:35 2011 +0100 Wine release 1.3.13 --- news/en/2011020401.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2011020401.xml b/news/en/2011020401.xml new file mode 100644 index 0000000..4a4923f --- /dev/null +++ b/news/en/2011020401.xml @@ -0,0 +1,16 @@ +<news> +<date>February 4, 2011</date> +<title>Wine 1.3.13 Released</title> +<body> + The Wine development release 1.3.13 is now available. + <a href="{$root}/announce/1.3.13">What's new</a> in this release: +<ul> + <li>Tools for creating MSI installers.</li> + <li>Clipboard improvements.</li> + <li>Support for po files in the message compiler.</li> + <li>Improvements to the Wine debugger.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.13.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.3.13 : Alexandre Julliard : Release 1.3.13
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: refs/tags/wine-1.3.13 Tag: be238c94507bad91981f646c4876b29d56c22a58 URL: http://source.winehq.org/git/wine.git/?a=tag;h=be238c94507bad91981f646c4876… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 20:06:52 2011 +0100 Release 1.3.13

1 0

Alexandre Julliard : Release 1.3.13.
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: bf640445c748b0588616da201e8ff8f3b1c778e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf640445c748b0588616da201… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 20:06:51 2011 +0100 Release 1.3.13. --- ANNOUNCE | 1058 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 500 insertions(+), 578 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf640445c748b0588616d…

1 0

Alexander Morozov : shell32/tests: NT4 doesn't have the Folder2 interface.
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: 780f9b3b4fe8ff17784860a2a65b4ecab268436a URL: http://source.winehq.org/git/wine.git/?a=commit;h=780f9b3b4fe8ff17784860a2a… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Feb 4 15:32:06 2011 +0300 shell32/tests: NT4 doesn't have the Folder2 interface. --- dlls/shell32/tests/shelldispatch.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 2652afe..0200e86 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -174,7 +174,9 @@ static void test_namespace(void) if (r == S_OK) { r = Folder_QueryInterface(folder, &IID_Folder2, (LPVOID*)&folder2); - ok(r == S_OK, "Folder::QueryInterface failed: %08x\n", r); + ok(r == S_OK || + broken(r == E_NOINTERFACE), /* NT4 */ + "Folder::QueryInterface failed: %08x\n", r); if (r == S_OK) { r = Folder2_get_Self(folder2, &item); @@ -229,7 +231,9 @@ static void test_namespace(void) SysFreeString(title); } r = Folder_QueryInterface(folder, &IID_Folder2, (LPVOID*)&folder2); - ok(r == S_OK, "Folder::QueryInterface failed: %08x\n", r); + ok(r == S_OK || + broken(r == E_NOINTERFACE), /* NT4 */ + "Folder::QueryInterface failed: %08x\n", r); if (r == S_OK) { r = Folder2_get_Self(folder2, &item); @@ -273,7 +277,9 @@ static void test_namespace(void) SysFreeString(title); } r = Folder_QueryInterface(folder, &IID_Folder2, (LPVOID*)&folder2); - ok(r == S_OK, "Folder::QueryInterface failed: %08x\n", r); + ok(r == S_OK || + broken(r == E_NOINTERFACE), /* NT4 */ + "Folder::QueryInterface failed: %08x\n", r); if (r == S_OK) { r = Folder2_get_Self(folder2, &item);

1 0

Joris Huizer : rpcrt4: Reduce scope of variable (Clang).
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: 3312d63119ac0a05daf89fc44bcc2c54c2d63a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3312d63119ac0a05daf89fc44… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Fri Feb 4 12:38:45 2011 +0100 rpcrt4: Reduce scope of variable (Clang). --- dlls/rpcrt4/ndr_marshall.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index db8be60..1e99c2e 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -919,7 +919,6 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, } if (pointer_needs_unmarshaling) { - unsigned char *base_ptr_val = *pPointer; unsigned char **current_ptr = pPointer; if (pStubMsg->IsClient) { TRACE("client\n"); @@ -932,7 +931,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (!fMustAlloc) { if (pSrcPointer) { TRACE("setting *pPointer to %p\n", pSrcPointer); - *pPointer = base_ptr_val = pSrcPointer; + *pPointer = pSrcPointer; } else fMustAlloc = TRUE; } @@ -945,7 +944,6 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (attr & RPC_FC_P_DEREF) { fMustAlloc = TRUE; } else { - base_ptr_val = NULL; *current_ptr = NULL; } } @@ -955,7 +953,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (attr & RPC_FC_P_DEREF) { if (fMustAlloc) { - base_ptr_val = NdrAllocate(pStubMsg, sizeof(void *)); + unsigned char *base_ptr_val = NdrAllocate(pStubMsg, sizeof(void *)); *pPointer = base_ptr_val; current_ptr = (unsigned char **)base_ptr_val; } else

1 0

Huw Davies : rpcrt4/tests: Add a test for marshalling a pointer to a user type, where the user type is itself a pointer.
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: 5102d4df8c0c8c7ee7224b32ea9b7b5c80055d02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5102d4df8c0c8c7ee7224b32e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 4 10:19:18 2011 +0000 rpcrt4/tests: Add a test for marshalling a pointer to a user type, where the user type is itself a pointer. --- dlls/rpcrt4/tests/server.c | 18 +++++++++++++++++- dlls/rpcrt4/tests/server.idl | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index f07fad4..1764718 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -562,6 +562,16 @@ s_hash_bstr(bstr_t b) } void +s_get_a_bstr(bstr_t *b) +{ + bstr_t bstr; + short str[] = {5, 'W', 'i', 'n', 'e', 0}; + bstr = HeapAlloc(GetProcessHeap(), 0, sizeof(str)); + memcpy(bstr, str, sizeof(str)); + *b = bstr + 1; +} + +void s_get_name(name_t *name) { const char bossman[] = "Jeremy White"; @@ -1119,7 +1129,7 @@ pointer_tests(void) puints_t pus; cpuints_t cpus; short bstr_data[] = { 5, 'H', 'e', 'l', 'l', 'o' }; - bstr_t bstr = &bstr_data[1]; + bstr_t bstr = &bstr_data[1], bstr2; name_t name; void *buffer; int *pa2; @@ -1167,6 +1177,12 @@ pointer_tests(void) ok(hash_bstr(bstr) == s_hash_bstr(bstr), "RPC hash_bstr_data\n"); + get_a_bstr(&bstr); + s_get_a_bstr(&bstr2); + ok(!lstrcmpW((LPCWSTR)bstr, (LPCWSTR)bstr2), "bstr mismatch\n"); + HeapFree(GetProcessHeap(), 0, bstr - 1); + HeapFree(GetProcessHeap(), 0, bstr2 - 1); + free_list(list); if (!old_windows_version) diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 89f9930..2605c12 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -311,7 +311,7 @@ cpp_quote("#endif") typedef [unique] user_bstr_t *wire_bstr_t; typedef [wire_marshal(wire_bstr_t)] short *bstr_t; unsigned hash_bstr(bstr_t s); - + void get_a_bstr([out]bstr_t *s); typedef struct { [string, size_is(size)] char *name;

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
68
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 February 2011