Removed several patches (accepted upstream).

This commit is contained in:
Sebastian Lackner 2015-02-24 18:00:05 +01:00
parent 8b3e8d11a8
commit 11fe964c46
9 changed files with 116 additions and 405 deletions

View File

@ -72,7 +72,7 @@ Included bug fixes and improvements
* Basic handling of write watches triggered while we're on the signal stack.
* Basic support for CUDA
* Black & White needs DXTn software decoding support ([Wine Bug #14939](https://bugs.winehq.org/show_bug.cgi?id=14939))
* Call DriverUnload function when unloading a device driver.
* ~~Call DriverUnload function when unloading a device driver.~~
* Child of Light expects FindConnectionPoint to succeed and increase the refcount ([Wine Bug #36408](https://bugs.winehq.org/show_bug.cgi?id=36408))
* CreateProcess does not prioritize the working directory over the system search path ([Wine Bug #23934](https://bugs.winehq.org/show_bug.cgi?id=23934))
* D3DCompileShader should filter specific warning messages ([Wine Bug #33770](https://bugs.winehq.org/show_bug.cgi?id=33770))
@ -221,5 +221,5 @@ Included bug fixes and improvements
* eRacer Demo doesn't correctly display text ([Wine Bug #29598](https://bugs.winehq.org/show_bug.cgi?id=29598))
* ntdll is missing WinSqm[Start|End]Session implementation ([Wine Bug #31971](https://bugs.winehq.org/show_bug.cgi?id=31971))
* wglDescribePixelFormat should return max index for NULL descriptor ([Wine Bug #6176](https://bugs.winehq.org/show_bug.cgi?id=6176))
* wininet should allow Accept-Encoding header for HTTP/1.0 ([Wine Bug #37046](https://bugs.winehq.org/show_bug.cgi?id=37046))
* ~~wininet should allow Accept-Encoding header for HTTP/1.0~~ ([Wine Bug #37046](https://bugs.winehq.org/show_bug.cgi?id=37046))

3
debian/changelog vendored
View File

@ -5,6 +5,9 @@ wine-staging (1.7.38) UNRELEASED; urgency=low
* Added patch to skip Wine specific __wine_check_for_events calls in ReactOS (by Amine Khaldi, wine-patched/pull/4).
* Added patch to declare pDirectInputCreateEx in a MSVC compatible way (by Amine Khaldi, wine-patched/pull/5).
* Added patch to complete and properly pack DNS_HEADER structure (by Amine Khaldi, wine-patched/pull/6).
* Removed patch to properly call DriverUnload when unloading device drivers (accepted upstream).
* Removed patch to allow Accept-Encoding for HTTP/1.0 in wininet (accepted upstream).
* Removed patch to declare pDirectInputCreateEx in a MSVC compatible way (accepted upstream).
-- Sebastian Lackner <sebastian@fds-team.de> Mon, 23 Feb 2015 18:24:51 +0100
wine-staging (1.7.37) unstable; urgency=low

View File

@ -1,4 +1,4 @@
From f1bd4d7ee8a8ecdbea7db01d74c214f4408e0cda Mon Sep 17 00:00:00 2001
From afa71d7e68a223ab929924a33cac06dfb9c69fdd Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 29 Nov 2014 21:02:57 +0100
Subject: winedbg: Change bug reporting URL to Wine Staging.
@ -54,10 +54,10 @@ Subject: winedbg: Change bug reporting URL to Wine Staging.
47 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/po/ar.po b/po/ar.po
index 2588606..89000c0 100644
index d13fba4..df2265c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -13676,12 +13676,12 @@ msgstr "تفاصيل خطأ البرنامج"
@@ -13730,12 +13730,12 @@ msgstr "تفاصيل خطأ البرنامج"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -73,10 +73,10 @@ index 2588606..89000c0 100644
#: winedbg.rc:38
diff --git a/po/bg.po b/po/bg.po
index daf8562..2c5c2fa 100644
index 6c96994..68cd5c2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -13528,7 +13528,7 @@ msgstr "Program Files"
@@ -13572,7 +13572,7 @@ msgstr "Program Files"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -86,10 +86,10 @@ index daf8562..2c5c2fa 100644
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 7aefc76..2d77355 100644
index 7e46602..8528a9f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13937,12 +13937,12 @@ msgstr "Detalls d'Error de Programa"
@@ -13991,12 +13991,12 @@ msgstr "Detalls d'Error de Programa"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -105,10 +105,10 @@ index 7aefc76..2d77355 100644
#: winedbg.rc:38
diff --git a/po/cs.po b/po/cs.po
index d46a797..d56ee9e 100644
index 56bd765..b3afe1f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13569,12 +13569,12 @@ msgstr "Podrobnosti chyby programu"
@@ -13618,12 +13618,12 @@ msgstr "Podrobnosti chyby programu"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -124,10 +124,10 @@ index d46a797..d56ee9e 100644
#: winedbg.rc:38
diff --git a/po/da.po b/po/da.po
index 5a0ad65..e9883ca 100644
index bfaa555..62b1ac1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13826,7 +13826,7 @@ msgstr "Programfejl detaljer"
@@ -13880,7 +13880,7 @@ msgstr "Programfejl detaljer"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -137,10 +137,10 @@ index 5a0ad65..e9883ca 100644
msgstr ""
"Hvis dette problem ikke er til stede under Windows, og det endnu ikke er "
diff --git a/po/de.po b/po/de.po
index c13802d..aa05fcd 100644
index f99a105..dd50b32 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13777,12 +13777,12 @@ msgstr "Programmfehler-Details"
@@ -13820,12 +13820,12 @@ msgstr "Programmfehler-Details"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -156,10 +156,10 @@ index c13802d..aa05fcd 100644
#: winedbg.rc:38
diff --git a/po/el.po b/po/el.po
index 09de8a9..92b764d 100644
index 7561eae..3dd97a7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -13275,7 +13275,7 @@ msgstr ""
@@ -13315,7 +13315,7 @@ msgstr ""
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -169,10 +169,10 @@ index 09de8a9..92b764d 100644
msgstr ""
diff --git a/po/en.po b/po/en.po
index 5e66e7d..4c7c54d 100644
index 37774c9..44fffea 100644
--- a/po/en.po
+++ b/po/en.po
@@ -13683,12 +13683,12 @@ msgstr "Program Error Details"
@@ -13720,12 +13720,12 @@ msgstr "Program Error Details"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -188,10 +188,10 @@ index 5e66e7d..4c7c54d 100644
#: winedbg.rc:38
diff --git a/po/en_US.po b/po/en_US.po
index d48f5ce..3866623 100644
index bb379a9..57a76c6 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -13683,12 +13683,12 @@ msgstr "Program Error Details"
@@ -13720,12 +13720,12 @@ msgstr "Program Error Details"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -207,10 +207,10 @@ index d48f5ce..3866623 100644
#: winedbg.rc:38
diff --git a/po/eo.po b/po/eo.po
index 2f227f1..2c6c709 100644
index aa88ae9..1bf2425 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13139,7 +13139,7 @@ msgstr "Detaloj pri programa eraro"
@@ -13184,7 +13184,7 @@ msgstr "Detaloj pri programa eraro"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -220,10 +220,10 @@ index 2f227f1..2c6c709 100644
msgstr ""
diff --git a/po/es.po b/po/es.po
index 169ad25..52bd3ea 100644
index e0fc4e8..9fa9871 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13927,12 +13927,12 @@ msgstr "Detalles del error de programa"
@@ -13976,12 +13976,12 @@ msgstr "Detalles del error de programa"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -239,10 +239,10 @@ index 169ad25..52bd3ea 100644
#: winedbg.rc:38
diff --git a/po/fa.po b/po/fa.po
index d946db2..48a404c 100644
index 983b78b..b6170e2 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -13285,7 +13285,7 @@ msgstr ""
@@ -13324,7 +13324,7 @@ msgstr ""
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -252,10 +252,10 @@ index d946db2..48a404c 100644
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 88fd213..ba1fa4c 100644
index 6c4918a..caed7be 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13656,13 +13656,13 @@ msgstr "Ohjelman virhetiedot"
@@ -13704,13 +13704,13 @@ msgstr "Ohjelman virhetiedot"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -273,10 +273,10 @@ index 88fd213..ba1fa4c 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/fr.po b/po/fr.po
index 29e5942..e7b63f7 100644
index 9826d64..efdc015 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13855,13 +13855,13 @@ msgstr "Détails de l'erreur du programme"
@@ -13898,13 +13898,13 @@ msgstr "Détails de l'erreur du programme"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -294,10 +294,10 @@ index 29e5942..e7b63f7 100644
#: winedbg.rc:38
diff --git a/po/he.po b/po/he.po
index 0fbc004..e8f870b 100644
index f073882..cf07b98 100644
--- a/po/he.po
+++ b/po/he.po
@@ -13971,7 +13971,7 @@ msgstr ""
@@ -14016,7 +14016,7 @@ msgstr ""
"לכתובת http://appdb.winehq.org לקבלת עצות להרצת יישום זה.\n"
"\n"
"אם תקלה זו אינה קיימת בעת הרצת Windows ולא דווח עליה עדיין, ניתן לדווח עליה "
@ -306,7 +306,7 @@ index 0fbc004..e8f870b 100644
#: winedbg.rc:61
#, fuzzy
@@ -13987,7 +13987,7 @@ msgstr "שגיאה בתכנית"
@@ -14032,7 +14032,7 @@ msgstr "שגיאה בתכנית"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -316,10 +316,10 @@ index 0fbc004..e8f870b 100644
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 12ff530..9c53c1f 100644
index 5bc60bd..309a41a 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -13055,7 +13055,7 @@ msgstr "सूचना (&o)"
@@ -13093,7 +13093,7 @@ msgstr "सूचना (&o)"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -329,10 +329,10 @@ index 12ff530..9c53c1f 100644
msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 8fabba4..8213684 100644
index 8c9cb34..feff815 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -13365,7 +13365,7 @@ msgstr "Detalji greške programa"
@@ -13417,7 +13417,7 @@ msgstr "Detalji greške programa"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -342,10 +342,10 @@ index 8fabba4..8213684 100644
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 96dac97..b4019b2 100644
index 8b00920..b75139f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -13835,12 +13835,12 @@ msgstr "Program hibarészletező"
@@ -13889,12 +13889,12 @@ msgstr "Program hibarészletező"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -361,10 +361,10 @@ index 96dac97..b4019b2 100644
#: winedbg.rc:38
diff --git a/po/it.po b/po/it.po
index 86ca03e..e823b0d 100644
index 7f12d61..05980ad 100644
--- a/po/it.po
+++ b/po/it.po
@@ -13931,12 +13931,12 @@ msgstr "Dettagli dell'errore del programma"
@@ -13980,12 +13980,12 @@ msgstr "Dettagli dell'errore del programma"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -380,10 +380,10 @@ index 86ca03e..e823b0d 100644
#: winedbg.rc:38
diff --git a/po/ja.po b/po/ja.po
index fe43416..b2df2c4 100644
index 597fcbd..58e1338 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13677,12 +13677,12 @@ msgstr "プログラム エラーの詳細"
@@ -13720,12 +13720,12 @@ msgstr "プログラム エラーの詳細"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -400,10 +400,10 @@ index fe43416..b2df2c4 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/ko.po b/po/ko.po
index 9ab294e..663a64c 100644
index 5814eea..00ec87c 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -13706,12 +13706,12 @@ msgstr "자세한 프로그램 에러"
@@ -13760,12 +13760,12 @@ msgstr "자세한 프로그램 에러"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -419,10 +419,10 @@ index 9ab294e..663a64c 100644
#: winedbg.rc:38
diff --git a/po/lt.po b/po/lt.po
index 2ee9944..ad252ad 100644
index 87c8616..d6ff962 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -13697,13 +13697,13 @@ msgstr "Išsamiau apie programos klaidą"
@@ -13736,13 +13736,13 @@ msgstr "Išsamiau apie programos klaidą"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -440,10 +440,10 @@ index 2ee9944..ad252ad 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/ml.po b/po/ml.po
index 5e262a7..a1beeab 100644
index 808850e..52bea5d 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -13055,7 +13055,7 @@ msgstr "വി_വര"
@@ -13093,7 +13093,7 @@ msgstr "വി_വര"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -453,10 +453,10 @@ index 5e262a7..a1beeab 100644
msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 058f6de..4cd7f91 100644
index 1cbfac9..7076243 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -13729,12 +13729,12 @@ msgstr "Detaljer for programfeil"
@@ -13783,12 +13783,12 @@ msgstr "Detaljer for programfeil"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -472,10 +472,10 @@ index 058f6de..4cd7f91 100644
#: winedbg.rc:38
diff --git a/po/nl.po b/po/nl.po
index dd3e095..74aa74e 100644
index d447119..ad6c229 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -13886,7 +13886,7 @@ msgstr ""
@@ -13935,7 +13935,7 @@ msgstr ""
"Database</a> naar tips voor dit programma.\n"
"\n"
"Als dit probleem niet optreedt onder Windows en nog niet is gerapporteerd, "
@ -484,7 +484,7 @@ index dd3e095..74aa74e 100644
#: winedbg.rc:61
msgid "Show &Details"
@@ -13900,13 +13900,13 @@ msgstr "Programmafout details"
@@ -13949,13 +13949,13 @@ msgstr "Programmafout details"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -493,7 +493,7 @@ index dd3e095..74aa74e 100644
"and attach that file to the report."
msgstr ""
"Indien dit probleem zich niet voordoet onder Windows en het probleem is nog "
"niet gerapporteed, dan kunt U gedetailleerde informatie in een bestand "
"niet gerapporteerd, dan kunt U gedetailleerde informatie in een bestand "
"opslaan met de \"Opslaan als\" knop. Dit bestand kunt U via <a href=\"http://"
-"wiki.winehq.org/Bugs\">file a bug report</a> versturen."
+"bugs.wine-staging.com\">file a bug report</a> versturen."
@ -501,10 +501,10 @@ index dd3e095..74aa74e 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/or.po b/po/or.po
index 890364b..0867876 100644
index 44e1558..6a0aa4f 100644
--- a/po/or.po
+++ b/po/or.po
@@ -13055,7 +13055,7 @@ msgstr "ସୂଚନା (&o)"
@@ -13093,7 +13093,7 @@ msgstr "ସୂଚନା (&o)"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -514,10 +514,10 @@ index 890364b..0867876 100644
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 935d299..bad7dd9 100644
index 863eb02..18da35b 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -13055,7 +13055,7 @@ msgstr "ਜਾਣਕਾਰੀ(&o)"
@@ -13093,7 +13093,7 @@ msgstr "ਜਾਣਕਾਰੀ(&o)"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -527,10 +527,10 @@ index 935d299..bad7dd9 100644
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index aa9a3cb..f9fed41 100644
index 83c2198..df13302 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13791,12 +13791,12 @@ msgstr "Szczegóły błędu programu"
@@ -13792,12 +13792,12 @@ msgstr "Szczegóły błędu programu"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -546,10 +546,10 @@ index aa9a3cb..f9fed41 100644
#: winedbg.rc:38
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 628abf2..bd95001 100644
index 807ffba..3490be8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13757,13 +13757,13 @@ msgstr "Detalhes do Erro do Programa"
@@ -13806,13 +13806,13 @@ msgstr "Detalhes do Erro do Programa"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -567,10 +567,10 @@ index 628abf2..bd95001 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 4e4625e..7848b9e 100644
index 0916f7a..c4a57a8 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -13806,7 +13806,7 @@ msgstr "Detalhes do erro no programa"
@@ -13767,7 +13767,7 @@ msgstr "Detalhes do erro no programa"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -580,10 +580,10 @@ index 4e4625e..7848b9e 100644
msgstr ""
diff --git a/po/rm.po b/po/rm.po
index 554cc4f..76b6859 100644
index b29b8f7..8b10611 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -13152,7 +13152,7 @@ msgstr ""
@@ -13190,7 +13190,7 @@ msgstr ""
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -593,10 +593,10 @@ index 554cc4f..76b6859 100644
msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 7e91c75..fa48c79 100644
index a21837a..fa4bc10 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -13926,7 +13926,7 @@ msgstr "Detalii eroare de program"
@@ -13975,7 +13975,7 @@ msgstr "Detalii eroare de program"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -606,10 +606,10 @@ index 7e91c75..fa48c79 100644
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 2edc019..f314afb 100644
index d6640e2..866c94d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13691,13 +13691,13 @@ msgstr "Подробности об ошибке"
@@ -13739,13 +13739,13 @@ msgstr "Подробности об ошибке"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -627,10 +627,10 @@ index 2edc019..f314afb 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/sk.po b/po/sk.po
index 6fc277e..22b83d9 100644
index e85f894..d4487e0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -13317,7 +13317,7 @@ msgstr ""
@@ -13366,7 +13366,7 @@ msgstr ""
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -640,10 +640,10 @@ index 6fc277e..22b83d9 100644
msgstr ""
diff --git a/po/sl.po b/po/sl.po
index a2abdb6..c9b1627 100644
index 42b62e7..b5777a0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13861,13 +13861,13 @@ msgstr "Podrobnosti napake v programu"
@@ -13915,13 +13915,13 @@ msgstr "Podrobnosti napake v programu"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -661,10 +661,10 @@ index a2abdb6..c9b1627 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index e2a31e4..af5eef8 100644
index 4bb2989..2705836 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -13821,7 +13821,7 @@ msgstr ""
@@ -13866,7 +13866,7 @@ msgstr ""
"http://appdb.winehq.org за савете о покретању овог програма.\n"
"\n"
"Ако овај проблем није присутан под Windows-ом и још увек није пријављен, "
@ -673,7 +673,7 @@ index e2a31e4..af5eef8 100644
#: winedbg.rc:61
#, fuzzy
@@ -13837,7 +13837,7 @@ msgstr "Програмска грешка"
@@ -13882,7 +13882,7 @@ msgstr "Програмска грешка"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -683,10 +683,10 @@ index e2a31e4..af5eef8 100644
msgstr ""
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index 87868db..7f88b61 100644
index 9f36f5e..64bad0b 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -13963,7 +13963,7 @@ msgstr ""
@@ -14011,7 +14011,7 @@ msgstr ""
"http://appdb.winehq.org za savete o pokretanju ovog programa.\n"
"\n"
"Ako ovaj problem nije prisutan pod Windows-om i još uvek nije prijavljen, "
@ -695,7 +695,7 @@ index 87868db..7f88b61 100644
#: winedbg.rc:61
#, fuzzy
@@ -13979,7 +13979,7 @@ msgstr "Programska greška"
@@ -14027,7 +14027,7 @@ msgstr "Programska greška"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -705,10 +705,10 @@ index 87868db..7f88b61 100644
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index edff0bc..8cd031b 100644
index 7e1f146..935959b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13615,12 +13615,12 @@ msgstr "Detaljer om programfel"
@@ -13669,12 +13669,12 @@ msgstr "Detaljer om programfel"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -724,10 +724,10 @@ index edff0bc..8cd031b 100644
#: winedbg.rc:38
diff --git a/po/te.po b/po/te.po
index 8efc913..4ede310 100644
index a88f9e3..42b5cb0 100644
--- a/po/te.po
+++ b/po/te.po
@@ -13055,7 +13055,7 @@ msgstr "సమాచారము (&o)"
@@ -13093,7 +13093,7 @@ msgstr "సమాచారము (&o)"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -737,10 +737,10 @@ index 8efc913..4ede310 100644
msgstr ""
diff --git a/po/th.po b/po/th.po
index 8661bf8..7cab7f0 100644
index c6e43a2..c0af854 100644
--- a/po/th.po
+++ b/po/th.po
@@ -13320,7 +13320,7 @@ msgstr "ปรับแต่งนาฬิกา"
@@ -13359,7 +13359,7 @@ msgstr "ปรับแต่งนาฬิกา"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -750,10 +750,10 @@ index 8661bf8..7cab7f0 100644
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index b8d7f16..845c630 100644
index 514cfe9..a20899d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13672,12 +13672,12 @@ msgstr "Program Hata Detayları"
@@ -13724,12 +13724,12 @@ msgstr "Program Hata Detayları"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -769,10 +769,10 @@ index b8d7f16..845c630 100644
#: winedbg.rc:38
diff --git a/po/uk.po b/po/uk.po
index 87f234f..1629445 100644
index 37d9a08..7c2982a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -13772,12 +13772,12 @@ msgstr "Дані про помилку програми"
@@ -13820,12 +13820,12 @@ msgstr "Дані про помилку програми"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -788,10 +788,10 @@ index 87f234f..1629445 100644
#: winedbg.rc:38
diff --git a/po/wa.po b/po/wa.po
index 0dcc7cc..52a168a 100644
index 2cd44bc..f305e98 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -13222,7 +13222,7 @@ msgstr "&Propietés"
@@ -13261,7 +13261,7 @@ msgstr "&Propietés"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -801,10 +801,10 @@ index 0dcc7cc..52a168a 100644
msgstr ""
diff --git a/po/wine.pot b/po/wine.pot
index d3a68ea..9289e7f 100644
index c079885..7816173 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -12987,7 +12987,7 @@ msgstr ""
@@ -13024,7 +13024,7 @@ msgstr ""
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -814,10 +814,10 @@ index d3a68ea..9289e7f 100644
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1f442d1..6bdf7ec 100644
index e3d9636..2e5622a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13191,11 +13191,11 @@ msgstr "程序错误详情"
@@ -13240,11 +13240,11 @@ msgstr "程序错误详情"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -832,10 +832,10 @@ index 1f442d1..6bdf7ec 100644
#: winedbg.rc:38
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e6ca7f8..5bbf37b 100644
index 9635357..c18c718 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -13578,11 +13578,11 @@ msgstr "程式錯誤詳細資訊"
@@ -13632,11 +13632,11 @@ msgstr "程式錯誤詳細資訊"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -863,5 +863,5 @@ index 7514f9d..11de95d 100644
IDC_STATIC_TXT2,"SysLink",0,6,285,388,32
DEFPUSHBUTTON "Close", IDOK, 326, 320, 70, 16, WS_TABSTOP
--
2.1.3
2.3.0

View File

@ -1,25 +0,0 @@
From f7356c55fbeb2cc4d4ffa0b684e371ffc8183731 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 23 Feb 2015 21:40:25 +0100
Subject: dinput/tests: Declare pDirectInputCreateEx in a MSVC compatible way.
---
dlls/dinput/tests/dinput.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c
index 0490642..5ac55cf 100644
--- a/dlls/dinput/tests/dinput.c
+++ b/dlls/dinput/tests/dinput.c
@@ -50,7 +50,7 @@ static const DWORD directinput_version_list[] =
DIRECTINPUT_VERSION_700,
};
-static HRESULT WINAPI (*pDirectInputCreateEx)(HINSTANCE, DWORD, REFIID, LPVOID *, LPUNKNOWN);
+static HRESULT (WINAPI *pDirectInputCreateEx)(HINSTANCE, DWORD, REFIID, LPVOID *, LPUNKNOWN);
static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context)
{
--
2.3.0

View File

@ -84,7 +84,6 @@ patch_enable_all ()
enable_d3dx9_36_UpdateSkinnedMesh="$1"
enable_dbghelp_Debug_Symbols="$1"
enable_ddraw_d3d_execute_buffer="$1"
enable_dinput_Compile_Fix="$1"
enable_dinput_Events="$1"
enable_dsound_Fast_Mixer="$1"
enable_dxgi_GetDesc="$1"
@ -195,7 +194,6 @@ patch_enable_all ()
enable_wined3d_CSMT_Main="$1"
enable_wined3d_DXTn="$1"
enable_wined3d_Revert_PixelFormat="$1"
enable_winedevice_DriverUnload="$1"
enable_winedevice_Fix_Relocation="$1"
enable_winemenubuilder_Desktop_Icon_Path="$1"
enable_winepulse_PulseAudio_Support="$1"
@ -206,7 +204,6 @@ patch_enable_all ()
enable_winex11_Window_Style="$1"
enable_winex11_XEMBED="$1"
enable_winex11_wglShareLists="$1"
enable_wininet_encoding="$1"
enable_winmm_Delay_Import_Depends="$1"
enable_wpcap_Dynamic_Linking="$1"
enable_ws2_32_Connect_Time="$1"
@ -286,9 +283,6 @@ patch_enable ()
ddraw-d3d_execute_buffer)
enable_ddraw_d3d_execute_buffer="$2"
;;
dinput-Compile_Fix)
enable_dinput_Compile_Fix="$2"
;;
dinput-Events)
enable_dinput_Events="$2"
;;
@ -619,9 +613,6 @@ patch_enable ()
wined3d-Revert_PixelFormat)
enable_wined3d_Revert_PixelFormat="$2"
;;
winedevice-DriverUnload)
enable_winedevice_DriverUnload="$2"
;;
winedevice-Fix_Relocation)
enable_winedevice_Fix_Relocation="$2"
;;
@ -652,9 +643,6 @@ patch_enable ()
winex11-wglShareLists)
enable_winex11_wglShareLists="$2"
;;
wininet-encoding)
enable_wininet_encoding="$2"
;;
winmm-Delay_Import_Depends)
enable_winmm_Delay_Import_Depends="$2"
;;
@ -1469,18 +1457,6 @@ if test "$enable_ddraw_d3d_execute_buffer" -eq 1; then
) >> "$patchlist"
fi
# Patchset dinput-Compile_Fix
# |
# | Modified files:
# | * dlls/dinput/tests/dinput.c
# |
if test "$enable_dinput_Compile_Fix" -eq 1; then
patch_apply dinput-Compile_Fix/0001-dinput-tests-Declare-pDirectInputCreateEx-in-a-MSVC-.patch
(
echo '+ { "Amine Khaldi", "dinput/tests: Declare pDirectInputCreateEx in a MSVC compatible way.", 1 },';
) >> "$patchlist"
fi
# Patchset dinput-Events
# |
# | This patchset fixes the following Wine bugs:
@ -1529,18 +1505,6 @@ if test "$enable_dxgi_GetDesc" -eq 1; then
) >> "$patchlist"
fi
# Patchset makedep-PARENTSPEC
# |
# | Modified files:
# | * tools/makedep.c
# |
if test "$enable_makedep_PARENTSPEC" -eq 1; then
patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
(
echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
) >> "$patchlist"
fi
# Patchset ntdll-DllRedirects
# |
# | Modified files:
@ -1561,6 +1525,18 @@ if test "$enable_ntdll_DllRedirects" -eq 1; then
) >> "$patchlist"
fi
# Patchset makedep-PARENTSPEC
# |
# | Modified files:
# | * tools/makedep.c
# |
if test "$enable_makedep_PARENTSPEC" -eq 1; then
patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
(
echo '+ { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-CSMT_Helper
# |
# | Modified files:
@ -3734,18 +3710,6 @@ if test "$enable_winecfg_Libraries" -eq 1; then
) >> "$patchlist"
fi
# Patchset winedevice-DriverUnload
# |
# | Modified files:
# | * programs/winedevice/device.c
# |
if test "$enable_winedevice_DriverUnload" -eq 1; then
patch_apply winedevice-DriverUnload/0001-winedevice-Call-DriverUnload-function-when-unloading.patch
(
echo '+ { "Michael Müller", "winedevice: Call DriverUnload function when unloading a driver.", 1 },';
) >> "$patchlist"
fi
# Patchset winedevice-Fix_Relocation
# |
# | This patchset fixes the following Wine bugs:
@ -3967,21 +3931,6 @@ if test "$enable_winex11_wglShareLists" -eq 1; then
) >> "$patchlist"
fi
# Patchset wininet-encoding
# |
# | This patchset fixes the following Wine bugs:
# | * [#37046] wininet should allow Accept-Encoding header for HTTP/1.0
# |
# | Modified files:
# | * dlls/wininet/http.c, dlls/wininet/tests/http.c
# |
if test "$enable_wininet_encoding" -eq 1; then
patch_apply wininet-encoding/0001-wininet-Allow-Accept-Encoding-for-HTTP-1.0-requests.patch
(
echo '+ { "Michael Müller", "wininet: Allow Accept-Encoding for HTTP/1.0 requests.", 1 },';
) >> "$patchlist"
fi
# Patchset winmm-Delay_Import_Depends
# |
# | This patchset fixes the following Wine bugs:

View File

@ -1,83 +0,0 @@
From 2ccb50c0dd04ae77d39dac6406f8cfa6e102aa91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 26 Jan 2015 04:31:10 +0100
Subject: winedevice: Call DriverUnload function when unloading a driver.
Based on a patch by Alexander Morozov.
---
programs/winedevice/device.c | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
index 72bc124..edd7c83 100644
--- a/programs/winedevice/device.c
+++ b/programs/winedevice/device.c
@@ -45,6 +45,7 @@ static SERVICE_STATUS_HANDLE service_handle;
static HKEY driver_hkey;
static HANDLE stop_event;
static DRIVER_OBJECT driver_obj;
+static HMODULE driver_module;
static DRIVER_EXTENSION driver_extension;
/* find the LDR_MODULE corresponding to the driver module */
@@ -167,8 +168,26 @@ static NTSTATUS init_driver( HMODULE module, UNICODE_STRING *keyname )
return status;
}
+/* call the driver unload function */
+static void unload_driver( HMODULE module, DRIVER_OBJECT *driver_obj )
+{
+ if (driver_obj->DriverUnload)
+ {
+ if (WINE_TRACE_ON(relay))
+ WINE_DPRINTF( "%04x:Call driver unload %p (obj=%p)\n", GetCurrentThreadId(),
+ driver_obj->DriverUnload, driver_obj );
+
+ driver_obj->DriverUnload( driver_obj );
+
+ if (WINE_TRACE_ON(relay))
+ WINE_DPRINTF( "%04x:Ret driver unload %p (obj=%p)\n", GetCurrentThreadId(),
+ driver_obj->DriverUnload, driver_obj );
+ }
+ FreeLibrary( module );
+}
+
/* load the .sys module for a device driver */
-static BOOL load_driver(void)
+static HMODULE load_driver(void)
{
static const WCHAR driversW[] = {'\\','d','r','i','v','e','r','s','\\',0};
static const WCHAR systemrootW[] = {'\\','S','y','s','t','e','m','R','o','o','t','\\',0};
@@ -249,10 +268,10 @@ static BOOL load_driver(void)
module = load_driver_module( str );
HeapFree( GetProcessHeap(), 0, path );
- if (!module) return FALSE;
+ if (!module) return NULL;
init_driver( module, &keypath );
- return TRUE;
+ return module;
}
static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context )
@@ -305,13 +324,15 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv )
status.dwWaitHint = 10000;
SetServiceStatus( service_handle, &status );
- if (load_driver())
+ driver_module = load_driver();
+ if (driver_module)
{
status.dwCurrentState = SERVICE_RUNNING;
status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
SetServiceStatus( service_handle, &status );
wine_ntoskrnl_main_loop( stop_event );
+ unload_driver( driver_module, &driver_obj );
}
else WINE_ERR( "driver %s failed to load\n", wine_dbgstr_w(driver_name) );
--
1.9.1

View File

@ -1 +0,0 @@
Fixes: Call DriverUnload function when unloading a device driver.

View File

@ -1,131 +0,0 @@
From 9944fecef8ce9c9bfeab1870b009022a24f9dc1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 8 Dec 2014 02:51:30 +0100
Subject: wininet: Allow Accept-Encoding for HTTP/1.0 requests.
---
dlls/wininet/http.c | 22 ++--------------------
dlls/wininet/tests/http.c | 46 +++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 532b65a..ee89061 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -217,7 +217,6 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len );
static DWORD HTTP_HttpQueryInfoW(http_request_t*, DWORD, LPVOID, LPDWORD, LPDWORD);
static LPWSTR HTTP_GetRedirectURL(http_request_t *req, LPCWSTR lpszUrl);
static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin);
-static BOOL HTTP_VerifyValidHeader(http_request_t *req, LPCWSTR field);
static BOOL drain_content(http_request_t*,BOOL);
static CRITICAL_SECTION connection_pool_cs;
@@ -1324,10 +1323,8 @@ static DWORD HTTP_HttpAddRequestHeadersW(http_request_t *request,
pFieldAndValue = HTTP_InterpretHttpHeader(lpszStart);
if (pFieldAndValue)
{
- res = HTTP_VerifyValidHeader(request, pFieldAndValue[0]);
- if (res == ERROR_SUCCESS)
- res = HTTP_ProcessHeader(request, pFieldAndValue[0],
- pFieldAndValue[1], dwModifier | HTTP_ADDHDR_FLAG_REQ);
+ res = HTTP_ProcessHeader(request, pFieldAndValue[0],
+ pFieldAndValue[1], dwModifier | HTTP_ADDHDR_FLAG_REQ);
HTTP_FreeTokens(pFieldAndValue);
}
@@ -6335,21 +6332,6 @@ static BOOL HTTP_DeleteCustomHeader(http_request_t *request, DWORD index)
/***********************************************************************
- * HTTP_VerifyValidHeader (internal)
- *
- * Verify the given header is not invalid for the given http request
- *
- */
-static BOOL HTTP_VerifyValidHeader(http_request_t *request, LPCWSTR field)
-{
- /* Accept-Encoding is stripped from HTTP/1.0 requests. It is invalid */
- if (!strcmpW(request->version, g_szHttp1_0) && !strcmpiW(field, szAccept_Encoding))
- return ERROR_HTTP_INVALID_HEADER;
-
- return ERROR_SUCCESS;
-}
-
-/***********************************************************************
* IsHostInProxyBypassList (@)
*
* Undocumented
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 92a6b8d..3e66a27 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -2314,7 +2314,13 @@ static DWORD CALLBACK server_thread(LPVOID param)
}
if (strstr(buffer, "GET /test_premature_disconnect"))
trace("closing connection\n");
-
+ if (strstr(buffer, "/test_accept_encoding_http10"))
+ {
+ if (strstr(buffer, "Accept-Encoding: gzip"))
+ send(c, okmsg, sizeof okmsg-1, 0);
+ else
+ send(c, notokmsg, sizeof notokmsg-1, 0);
+ }
shutdown(c, 2);
closesocket(c);
c = -1;
@@ -4169,6 +4175,43 @@ static void test_request_content_length(int port)
CloseHandle(hCompleteEvent);
}
+static void test_accept_encoding(int port)
+{
+ HINTERNET ses, con, req;
+ BOOL ret;
+
+ ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
+ ok(ses != NULL, "InternetOpen failed\n");
+
+ con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0);
+ ok(con != NULL, "InternetConnect failed\n");
+
+ req = HttpOpenRequestA(con, "GET", "/test_accept_encoding_http10", "HTTP/1.0", NULL, NULL, 0, 0);
+ ok(req != NULL, "HttpOpenRequest failed\n");
+
+ ret = HttpAddRequestHeadersA(req, "Accept-Encoding: gzip\r\n", ~0u, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD);
+ ok(ret, "HttpAddRequestHeaders failed\n");
+
+ ret = HttpSendRequestA(req, NULL, 0, NULL, 0);
+ ok(ret, "HttpSendRequestA failed\n");
+
+ test_status_code(req, 200);
+
+ InternetCloseHandle(req);
+
+ req = HttpOpenRequestA(con, "GET", "/test_accept_encoding_http10", "HTTP/1.0", NULL, NULL, 0, 0);
+ ok(req != NULL, "HttpOpenRequest failed\n");
+
+ ret = HttpSendRequestA(req, "Accept-Encoding: gzip", ~0u, NULL, 0);
+ ok(ret, "HttpSendRequestA failed\n");
+
+ test_status_code(req, 200);
+
+ InternetCloseHandle(req);
+ InternetCloseHandle(con);
+ InternetCloseHandle(ses);
+}
+
static void test_http_connection(void)
{
struct server_info si;
@@ -4215,6 +4258,7 @@ static void test_http_connection(void)
test_successive_HttpSendRequest(si.port);
test_head_request(si.port);
test_request_content_length(si.port);
+ test_accept_encoding(si.port);
/* send the basic request again to shutdown the server thread */
test_basic_request(si.port, "GET", "/quit");
--
2.1.3

View File

@ -1 +0,0 @@
Fixes: [37046] wininet should allow Accept-Encoding header for HTTP/1.0