From 6a5466cff18cb569f6f6057073e5d6633a0d8f76 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 8 Feb 2015 06:39:31 +0100 Subject: [PATCH] Added patch to add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2. --- README.md | 3 ++- debian/changelog | 1 + patches/patchinstall.sh | 19 +++++++++++++ ...istry-keys-for-Windows-Performance-L.patch | 27 +++++++++++++++++++ patches/wine.inf-Performance/definition | 1 + 5 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 patches/wine.inf-Performance/0001-wine.inf-Add-registry-keys-for-Windows-Performance-L.patch create mode 100644 patches/wine.inf-Performance/definition diff --git a/README.md b/README.md index cf438605..85a7677d 100644 --- a/README.md +++ b/README.md @@ -38,10 +38,11 @@ Wine. All those differences are also documented on the Included bug fixes and improvements =================================== -**Bugfixes and features included in the next upcoming release [11]:** +**Bugfixes and features included in the next upcoming release [12]:** * Add implementation for CreateThreadpool ([Wine Bug #35192](https://bugs.winehq.org/show_bug.cgi?id=35192)) * Add library override instead of closing winecfg when pressing ENTER over the combobox ([Wine Bug #12804](https://bugs.winehq.org/show_bug.cgi?id=12804)) +* Add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2 ([Wine Bug #33661](https://bugs.winehq.org/show_bug.cgi?id=33661)) * Call DriverUnload function when unloading a device driver. * Fix arguments for OSMesaMakeCurrent when using 16 bit formats * Fix check for end_frame in RtlUnwindEx on x86_64. ([Wine Bug #34254](https://bugs.winehq.org/show_bug.cgi?id=34254)) diff --git a/debian/changelog b/debian/changelog index 54ff63d2..a4e9661c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ wine-staging (1.7.36) UNRELEASED; urgency=low * Added patch to fix arguments for OSMesaMakeCurrent when using 16 bit formats. * Added patch to add library override instead of closing winecfg when pressing ENTER over the combobox. * Added patchset for various improvements and cleanup of reg.exe. + * Added patch to add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2. * Removed patch to add additional tests for SLGetWindowsInformationDWORD (accepted upstream). * Removed patch to avoid filling KdHelp structure for usermode applications (accepted upstream). -- Sebastian Lackner Sun, 25 Jan 2015 05:58:36 +0100 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 705d8676..33a0bc40 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -178,6 +178,7 @@ patch_enable_all () enable_user32_WndProc="$1" enable_vcomp_Stub_Functions="$1" enable_windowscodecs_TGA_Decoder="$1" + enable_wine.inf_Performance="$1" enable_wineboot_HKEY_DYN_DATA="$1" enable_winebuild_LinkerVersion="$1" enable_winecfg_Libraries="$1" @@ -559,6 +560,9 @@ patch_enable () windowscodecs-TGA_Decoder) enable_windowscodecs_TGA_Decoder="$2" ;; + wine.inf-Performance) + enable_wine.inf_Performance="$2" + ;; wineboot-HKEY_DYN_DATA) enable_wineboot_HKEY_DYN_DATA="$2" ;; @@ -3037,6 +3041,21 @@ if test "$enable_windowscodecs_TGA_Decoder" -eq 1; then ) >> "$patchlist" fi +# Patchset wine.inf-Performance +# | +# | This patchset fixes the following Wine bugs: +# | * [#33661] Add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2 +# | +# | Modified files: +# | * loader/wine.inf.in +# | +if test "$enable_wine.inf_Performance" -eq 1; then + patch_apply wine.inf-Performance/0001-wine.inf-Add-registry-keys-for-Windows-Performance-L.patch + ( + echo '+ { "Daniel Jelinski", "wine.inf: Add registry keys for Windows Performance Library.", 1 },'; + ) >> "$patchlist" +fi + # Patchset wineboot-HKEY_DYN_DATA # | # | This patchset fixes the following Wine bugs: diff --git a/patches/wine.inf-Performance/0001-wine.inf-Add-registry-keys-for-Windows-Performance-L.patch b/patches/wine.inf-Performance/0001-wine.inf-Add-registry-keys-for-Windows-Performance-L.patch new file mode 100644 index 00000000..6d0b11a6 --- /dev/null +++ b/patches/wine.inf-Performance/0001-wine.inf-Add-registry-keys-for-Windows-Performance-L.patch @@ -0,0 +1,27 @@ +From 94f11de5d7ea9594acdfb3d778d7abca7d2c3017 Mon Sep 17 00:00:00 2001 +From: Daniel Jelinski +Date: Sun, 8 Feb 2015 06:32:34 +0100 +Subject: wine.inf: Add registry keys for Windows Performance Library. + +--- + loader/wine.inf.in | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/loader/wine.inf.in b/loader/wine.inf.in +index a4548f2..d0548cb 100644 +--- a/loader/wine.inf.in ++++ b/loader/wine.inf.in +@@ -484,6 +484,10 @@ HKLM,%CurrentVersionNT%\Image File Execution Options,,16 + HKLM,%CurrentVersionNT%\Language Pack,,16 + HKLM,%CurrentVersionNT%\NetworkCards,,16 + HKLM,%CurrentVersionNT%\Perflib,,16 ++HKLM,%CurrentVersionNT%\Perflib,Last Counter,0x10003,1846 ++HKLM,%CurrentVersionNT%\Perflib,Last Help,0x10003,1847 ++HKLM,%CurrentVersionNT%\Perflib\009,Counter,0x10002,1,1847,1846,End Marker ++HKLM,%CurrentVersionNT%\Perflib\009,Help,0x10002,1847,End Marker + HKLM,%CurrentVersionNT%\Ports,,16 + HKLM,%CurrentVersionNT%\Print,,16 + HKLM,%CurrentVersionNT%\ProfileList,,16 +-- +2.2.2 + diff --git a/patches/wine.inf-Performance/definition b/patches/wine.inf-Performance/definition new file mode 100644 index 00000000..f8663ea2 --- /dev/null +++ b/patches/wine.inf-Performance/definition @@ -0,0 +1 @@ +Fixes: [33661] Add performance library registry keys needed by MS SQL Server Management Studio Express 2008 R2