From 263fd2e64a9776f180889aa98cc2909e526daa2c Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Mon, 2 Mar 2009 10:24:57 -0600 Subject: [PATCH] update Wine to wine-1.1.16 --- build.sh | 4 ++-- patches/0001-wine.inf.in-add-shortcuts-for-wine-programs.patch | 6 +++--- ...-hack-to-make-SPI_SETWORKAREA-work-in-virtual-desktop.patch | 2 +- .../0003-explorer-set-the-work-area-when-appbars-change.patch | 2 +- ...4-winex11-ignore-WM_TAKE_FOCUS-requests-for-desktop-w.patch | 2 +- ...5-winex11-use-a-flag-that-I-don-t-understand-when-pro.patch | 4 ++-- patches/0006-user32-hack-to-hide-minimized-window-icons.patch | 6 +++--- patches/0007-explorer-add-a-mostly-empty-taskbar.patch | 2 +- patches/0008-explorer-add-a-start-menu-to-the-taskbar.patch | 2 +- ...009-explorer-add-a-window-switcher-tasklist-to-the-ta.patch | 2 +- ...0010-tasklist-use-WM_SYSCOMMAND-instead-of-ShowWindow.patch | 2 +- patches/0011-taskbar-show-a-context-menu-on-right-click.patch | 2 +- patches/0012-tasklist-switch-to-user-drawn-buttons.patch | 2 +- patches/0013-tasklist-draw-icons.patch | 2 +- patches/0014-taskbar-make-the-start-menu-user-drawn.patch | 2 +- patches/0015-explorer-pack-buttons-based-on-text-size.patch | 2 +- ...6-explorer-don-t-activate-taskbar-and-related-windows.patch | 2 +- ...7-explorer-make-sure-minimized-windows-are-restored-b.patch | 2 +- patches/0018-explorer-add-Exit-menu-item.patch | 2 +- ...19-explorer-hack-to-keep-virtual-desktop-windows-open.patch | 2 +- .../0020-explorer-respect-the-dpi-setting-in-the-taskbar.patch | 2 +- ...1-explorer-calculate-the-maximum-taskbar-button-width.patch | 2 +- patches/0022-explorer-add-Run-command-to-the-start-menu.patch | 2 +- ...3-winex11.drv-hack-to-allow-changing-the-parent-of-vi.patch | 2 +- patches/0024-do-not-rely-on-a-consistent-user-id.patch | 10 +++++----- ...5-libwine-hard-code-the-username-because-Rainbow-like.patch | 2 +- ...6-allow-other-users-in-the-same-group-to-share-a-wine.patch | 6 +++--- patches/0027-default-to-150-dpi.patch | 4 ++-- patches/0028-explorer-stay-out-of-the-sugar-hot-corners.patch | 2 +- patches/0029-explorer-add-Run-from-Journal-to-start-menu.patch | 2 +- 30 files changed, 43 insertions(+), 43 deletions(-) diff --git a/build.sh b/build.sh index daafb1c..f7777db 100755 --- a/build.sh +++ b/build.sh @@ -19,8 +19,8 @@ ORIG_DIR=${PWD} BUILD_DIR=$(mktemp -d) WINE_ORIGIN=git://source.winehq.org/git/wine.git -WINE_BASE=6a1537c4b5037be5253c33021fda3a02430533f7 -WINE_COMMIT=eb7277f8e45761ad82de87699d1fd091dfaf4ca8 +WINE_BASE=0d7bec3578e02e1f551813e86100b59e36aec542 +WINE_COMMIT=e8bb8f3fe6a6c21267abea0d1a5492e9d365fc70 mkdir "${BUILD_DIR}"/Wine.activity diff --git a/patches/0001-wine.inf.in-add-shortcuts-for-wine-programs.patch b/patches/0001-wine.inf.in-add-shortcuts-for-wine-programs.patch index 0e9adb3..44def5d 100644 --- a/patches/0001-wine.inf.in-add-shortcuts-for-wine-programs.patch +++ b/patches/0001-wine.inf.in-add-shortcuts-for-wine-programs.patch @@ -1,4 +1,4 @@ -From db1e018c1c1b0687b35571c82ba21b99bb5c13da Mon Sep 17 00:00:00 2001 +From c71e9249847f1fb7c0a03c083b7fd6d626f93555 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Wed, 10 Sep 2008 12:28:38 -0500 Subject: [PATCH] wine.inf.in: add shortcuts for wine programs @@ -8,7 +8,7 @@ Subject: [PATCH] wine.inf.in: add shortcuts for wine programs 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in -index 3bf399e..b53984d 100644 +index 3f3afae..cf7e617 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -49,6 +49,10 @@ AddReg=\ @@ -33,7 +33,7 @@ index 3bf399e..b53984d 100644 [DefaultInstall.Services] AddService=MountMgr,0x800,MountMgrService -@@ -2725,3 +2733,19 @@ HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" +@@ -2726,3 +2734,19 @@ HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x400 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" diff --git a/patches/0002-hack-to-make-SPI_SETWORKAREA-work-in-virtual-desktop.patch b/patches/0002-hack-to-make-SPI_SETWORKAREA-work-in-virtual-desktop.patch index 29ea167..1fccb23 100644 --- a/patches/0002-hack-to-make-SPI_SETWORKAREA-work-in-virtual-desktop.patch +++ b/patches/0002-hack-to-make-SPI_SETWORKAREA-work-in-virtual-desktop.patch @@ -1,4 +1,4 @@ -From c9849f9fb2d894184a701fff8bc2ca92e352c4e0 Mon Sep 17 00:00:00 2001 +From 0d7803e8e312559917a87bd7c760496e6d3254d7 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Wed, 24 Sep 2008 11:40:57 -0500 Subject: [PATCH] hack to make SPI_SETWORKAREA work in virtual desktop mode diff --git a/patches/0003-explorer-set-the-work-area-when-appbars-change.patch b/patches/0003-explorer-set-the-work-area-when-appbars-change.patch index 69f1549..6f11a7b 100644 --- a/patches/0003-explorer-set-the-work-area-when-appbars-change.patch +++ b/patches/0003-explorer-set-the-work-area-when-appbars-change.patch @@ -1,4 +1,4 @@ -From 3c52c858c92c4299ba6afa3be0dd24f59d33e404 Mon Sep 17 00:00:00 2001 +From 3caf67f2a857a2dd67e39f8979e76fd2ea8a61fb Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Tue, 23 Sep 2008 16:23:04 -0500 Subject: [PATCH] explorer: set the work area when appbars change diff --git a/patches/0004-winex11-ignore-WM_TAKE_FOCUS-requests-for-desktop-w.patch b/patches/0004-winex11-ignore-WM_TAKE_FOCUS-requests-for-desktop-w.patch index 2d41daa..bc0fbdf 100644 --- a/patches/0004-winex11-ignore-WM_TAKE_FOCUS-requests-for-desktop-w.patch +++ b/patches/0004-winex11-ignore-WM_TAKE_FOCUS-requests-for-desktop-w.patch @@ -1,4 +1,4 @@ -From f03b7d6dee378dc9ae18c4ef80621974b769903f Mon Sep 17 00:00:00 2001 +From 1c452c4c39f896f4785da5106495537d210a8c1b Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Thu, 25 Sep 2008 13:27:30 -0500 Subject: [PATCH] winex11: ignore WM_TAKE_FOCUS requests for desktop windows diff --git a/patches/0005-winex11-use-a-flag-that-I-don-t-understand-when-pro.patch b/patches/0005-winex11-use-a-flag-that-I-don-t-understand-when-pro.patch index 44caa1a..1e35890 100644 --- a/patches/0005-winex11-use-a-flag-that-I-don-t-understand-when-pro.patch +++ b/patches/0005-winex11-use-a-flag-that-I-don-t-understand-when-pro.patch @@ -1,4 +1,4 @@ -From 458074baee5c913f36b1015d612de2b8adee8f01 Mon Sep 17 00:00:00 2001 +From 020ed8e2e4cb356fc30a9502f8658b7f37f31876 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Thu, 25 Sep 2008 16:24:28 -0500 Subject: [PATCH] winex11: use a flag that I don't understand when processing keyboard events @@ -13,7 +13,7 @@ what they are yet. 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c -index c9e4d16..83ec5d8 100644 +index 542e5a8..e66e6a7 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1463,7 +1463,7 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) diff --git a/patches/0006-user32-hack-to-hide-minimized-window-icons.patch b/patches/0006-user32-hack-to-hide-minimized-window-icons.patch index ec1e890..05772eb 100644 --- a/patches/0006-user32-hack-to-hide-minimized-window-icons.patch +++ b/patches/0006-user32-hack-to-hide-minimized-window-icons.patch @@ -1,4 +1,4 @@ -From 069871047aeb84a83451c51b53289499c2051815 Mon Sep 17 00:00:00 2001 +From a1655e48d0819bb01fa939e477251861232498d5 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Tue, 23 Sep 2008 09:24:06 -0500 Subject: [PATCH] user32: hack to hide minimized window icons @@ -8,10 +8,10 @@ Subject: [PATCH] user32: hack to hide minimized window icons 1 files changed, 2 insertions(+), 52 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c -index 6419478..642133e 100644 +index bb08e1e..91f236d 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c -@@ -762,58 +762,8 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, +@@ -763,58 +763,8 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, */ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) { diff --git a/patches/0007-explorer-add-a-mostly-empty-taskbar.patch b/patches/0007-explorer-add-a-mostly-empty-taskbar.patch index 4d27a5d..fe1d685 100644 --- a/patches/0007-explorer-add-a-mostly-empty-taskbar.patch +++ b/patches/0007-explorer-add-a-mostly-empty-taskbar.patch @@ -1,4 +1,4 @@ -From df30ada5e1ac46813c834b6c94cf2714ebfd02be Mon Sep 17 00:00:00 2001 +From 4b5360b4f84032f74bab80dfb11ec394d064f431 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Sat, 9 Aug 2008 11:06:11 -0500 Subject: [PATCH] explorer: add a mostly empty taskbar diff --git a/patches/0008-explorer-add-a-start-menu-to-the-taskbar.patch b/patches/0008-explorer-add-a-start-menu-to-the-taskbar.patch index 1724338..a91f0be 100644 --- a/patches/0008-explorer-add-a-start-menu-to-the-taskbar.patch +++ b/patches/0008-explorer-add-a-start-menu-to-the-taskbar.patch @@ -1,4 +1,4 @@ -From 8eef6e31d0d45621e9f59611049d0268b00e126c Mon Sep 17 00:00:00 2001 +From e760cc7b82bde17a5f42c4a3bb5d41222a309286 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Thu, 14 Aug 2008 13:38:48 -0500 Subject: [PATCH] explorer: add a start menu to the taskbar diff --git a/patches/0009-explorer-add-a-window-switcher-tasklist-to-the-ta.patch b/patches/0009-explorer-add-a-window-switcher-tasklist-to-the-ta.patch index 1d2b896..80c08b7 100644 --- a/patches/0009-explorer-add-a-window-switcher-tasklist-to-the-ta.patch +++ b/patches/0009-explorer-add-a-window-switcher-tasklist-to-the-ta.patch @@ -1,4 +1,4 @@ -From 58e1900f339c4db3dd3f2949a1fbc7f7e7e5e307 Mon Sep 17 00:00:00 2001 +From 5d0081ad0a2523efe9a5e7f666350ca0b71632dc Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Mon, 25 Aug 2008 08:39:06 -0500 Subject: [PATCH] explorer: add a window switcher (tasklist) to the taskbar diff --git a/patches/0010-tasklist-use-WM_SYSCOMMAND-instead-of-ShowWindow.patch b/patches/0010-tasklist-use-WM_SYSCOMMAND-instead-of-ShowWindow.patch index d174ca5..4211b53 100644 --- a/patches/0010-tasklist-use-WM_SYSCOMMAND-instead-of-ShowWindow.patch +++ b/patches/0010-tasklist-use-WM_SYSCOMMAND-instead-of-ShowWindow.patch @@ -1,4 +1,4 @@ -From 4658dd3d360088ac5d1adef1438a1f33798924f8 Mon Sep 17 00:00:00 2001 +From 490afb7725f574dff8fc3806e187381c476001c6 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Wed, 27 Aug 2008 13:01:39 -0500 Subject: [PATCH] tasklist: use WM_SYSCOMMAND instead of ShowWindow diff --git a/patches/0011-taskbar-show-a-context-menu-on-right-click.patch b/patches/0011-taskbar-show-a-context-menu-on-right-click.patch index 92add85..f0d6896 100644 --- a/patches/0011-taskbar-show-a-context-menu-on-right-click.patch +++ b/patches/0011-taskbar-show-a-context-menu-on-right-click.patch @@ -1,4 +1,4 @@ -From 5d9ce21a359c446f03e90e3e50455e3262bb8cf7 Mon Sep 17 00:00:00 2001 +From b619ac94b243b2fcb17ccf9b93fe13f15489d4ac Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Fri, 29 Aug 2008 08:37:32 -0500 Subject: [PATCH] taskbar: show a context menu on right-click diff --git a/patches/0012-tasklist-switch-to-user-drawn-buttons.patch b/patches/0012-tasklist-switch-to-user-drawn-buttons.patch index d1ee50d..8134338 100644 --- a/patches/0012-tasklist-switch-to-user-drawn-buttons.patch +++ b/patches/0012-tasklist-switch-to-user-drawn-buttons.patch @@ -1,4 +1,4 @@ -From 355fdbf6773470e79163535dafb1e984421b1ef7 Mon Sep 17 00:00:00 2001 +From 6db59310a3116b600b6e39eee08ce4b4638436c6 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Fri, 29 Aug 2008 14:59:05 -0500 Subject: [PATCH] tasklist: switch to user-drawn buttons diff --git a/patches/0013-tasklist-draw-icons.patch b/patches/0013-tasklist-draw-icons.patch index 0458956..0b390cd 100644 --- a/patches/0013-tasklist-draw-icons.patch +++ b/patches/0013-tasklist-draw-icons.patch @@ -1,4 +1,4 @@ -From 0a3bcfe137dac55af45753140fd3b2ac7531aa26 Mon Sep 17 00:00:00 2001 +From 2986a4323b956513fd0d3c9796a8b2e42820acc7 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Tue, 2 Sep 2008 10:23:26 -0500 Subject: [PATCH] tasklist: draw icons diff --git a/patches/0014-taskbar-make-the-start-menu-user-drawn.patch b/patches/0014-taskbar-make-the-start-menu-user-drawn.patch index a28113f..7bb2c9a 100644 --- a/patches/0014-taskbar-make-the-start-menu-user-drawn.patch +++ b/patches/0014-taskbar-make-the-start-menu-user-drawn.patch @@ -1,4 +1,4 @@ -From 7dcacc25f9586f9e05abb9ba611a582a8a650cb7 Mon Sep 17 00:00:00 2001 +From 40187ad6a589b8f4d084f504511b77e17a4cf8f2 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Thu, 18 Sep 2008 13:56:10 -0500 Subject: [PATCH] taskbar: make the start menu user-drawn diff --git a/patches/0015-explorer-pack-buttons-based-on-text-size.patch b/patches/0015-explorer-pack-buttons-based-on-text-size.patch index a1a3cf4..0db8807 100644 --- a/patches/0015-explorer-pack-buttons-based-on-text-size.patch +++ b/patches/0015-explorer-pack-buttons-based-on-text-size.patch @@ -1,4 +1,4 @@ -From 419b23f5686076175b4eda2153df832328f233bd Mon Sep 17 00:00:00 2001 +From a4566342b6c668c263801b35151f52d3342ace8c Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Tue, 23 Sep 2008 16:59:33 -0500 Subject: [PATCH] explorer: pack buttons based on text size diff --git a/patches/0016-explorer-don-t-activate-taskbar-and-related-windows.patch b/patches/0016-explorer-don-t-activate-taskbar-and-related-windows.patch index 551ac9b..7982832 100644 --- a/patches/0016-explorer-don-t-activate-taskbar-and-related-windows.patch +++ b/patches/0016-explorer-don-t-activate-taskbar-and-related-windows.patch @@ -1,4 +1,4 @@ -From 7ae71dbde418dc3fd2e21896d92d7ee618857442 Mon Sep 17 00:00:00 2001 +From 59096d1d8aff01745508379d18a3f8cd2210765e Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Thu, 25 Sep 2008 13:27:10 -0500 Subject: [PATCH] explorer: don't activate taskbar and related windows when showing them diff --git a/patches/0017-explorer-make-sure-minimized-windows-are-restored-b.patch b/patches/0017-explorer-make-sure-minimized-windows-are-restored-b.patch index 85c33d5..8bd983d 100644 --- a/patches/0017-explorer-make-sure-minimized-windows-are-restored-b.patch +++ b/patches/0017-explorer-make-sure-minimized-windows-are-restored-b.patch @@ -1,4 +1,4 @@ -From 86208a19f84657f442d14debef53e6331fca1004 Mon Sep 17 00:00:00 2001 +From aec6e20911dbe799f71f168cb802c0b81db0eab0 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Thu, 25 Sep 2008 14:56:29 -0500 Subject: [PATCH] explorer: make sure minimized windows are restored before making them the foreground diff --git a/patches/0018-explorer-add-Exit-menu-item.patch b/patches/0018-explorer-add-Exit-menu-item.patch index 6a05adf..c091e9c 100644 --- a/patches/0018-explorer-add-Exit-menu-item.patch +++ b/patches/0018-explorer-add-Exit-menu-item.patch @@ -1,4 +1,4 @@ -From a66f732415386dc5bf8ea7a86bee5b831f52955f Mon Sep 17 00:00:00 2001 +From 787ae8fc037df828e16f48df6884db294c1e287b Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Fri, 26 Sep 2008 14:53:51 -0500 Subject: [PATCH] explorer: add "Exit" menu item diff --git a/patches/0019-explorer-hack-to-keep-virtual-desktop-windows-open.patch b/patches/0019-explorer-hack-to-keep-virtual-desktop-windows-open.patch index 5be4b9f..2a54ead 100644 --- a/patches/0019-explorer-hack-to-keep-virtual-desktop-windows-open.patch +++ b/patches/0019-explorer-hack-to-keep-virtual-desktop-windows-open.patch @@ -1,4 +1,4 @@ -From 08dabed40917d587cffa5e6d2e841d35f2f7b1c7 Mon Sep 17 00:00:00 2001 +From e11c0ce36628acede327b7c1bcbe53c259d5cca3 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Fri, 26 Sep 2008 14:25:11 -0500 Subject: [PATCH] explorer: hack to keep virtual desktop windows open when processes close diff --git a/patches/0020-explorer-respect-the-dpi-setting-in-the-taskbar.patch b/patches/0020-explorer-respect-the-dpi-setting-in-the-taskbar.patch index 7694b98..190f1c6 100644 --- a/patches/0020-explorer-respect-the-dpi-setting-in-the-taskbar.patch +++ b/patches/0020-explorer-respect-the-dpi-setting-in-the-taskbar.patch @@ -1,4 +1,4 @@ -From 98a8410d759f0d98d3a6a3b39df7a43bf5de28b4 Mon Sep 17 00:00:00 2001 +From 480d41e819dac84c8a23796eaf67b2619e6d59c3 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Thu, 16 Oct 2008 12:28:39 -0500 Subject: [PATCH] explorer: respect the dpi setting in the taskbar diff --git a/patches/0021-explorer-calculate-the-maximum-taskbar-button-width.patch b/patches/0021-explorer-calculate-the-maximum-taskbar-button-width.patch index 56d7a9a..bd725bd 100644 --- a/patches/0021-explorer-calculate-the-maximum-taskbar-button-width.patch +++ b/patches/0021-explorer-calculate-the-maximum-taskbar-button-width.patch @@ -1,4 +1,4 @@ -From 9446c9ccc64647351e5d3f2432dda0f52dc76d28 Mon Sep 17 00:00:00 2001 +From 2616096d596bc40b9c75719f32342599379feb89 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Thu, 16 Oct 2008 16:24:27 -0500 Subject: [PATCH] explorer: calculate the maximum taskbar button width from the height diff --git a/patches/0022-explorer-add-Run-command-to-the-start-menu.patch b/patches/0022-explorer-add-Run-command-to-the-start-menu.patch index 4c57d2a..2854efb 100644 --- a/patches/0022-explorer-add-Run-command-to-the-start-menu.patch +++ b/patches/0022-explorer-add-Run-command-to-the-start-menu.patch @@ -1,4 +1,4 @@ -From 4ae0c3e2ff302e51c50e74d70f9d23d858d89c68 Mon Sep 17 00:00:00 2001 +From 8800872818f79949c2a0b87143d5116066066fd4 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Tue, 21 Oct 2008 13:22:53 -0500 Subject: [PATCH] explorer: add Run command to the start menu diff --git a/patches/0023-winex11.drv-hack-to-allow-changing-the-parent-of-vi.patch b/patches/0023-winex11.drv-hack-to-allow-changing-the-parent-of-vi.patch index 0ed851f..98277a8 100644 --- a/patches/0023-winex11.drv-hack-to-allow-changing-the-parent-of-vi.patch +++ b/patches/0023-winex11.drv-hack-to-allow-changing-the-parent-of-vi.patch @@ -1,4 +1,4 @@ -From 0d7899af0604c0f6caafd1c2c068a7690016d593 Mon Sep 17 00:00:00 2001 +From 8147b9ca37f63bf95c8d6a7968b367a6cb924c79 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Thu, 2 Oct 2008 13:55:41 -0500 Subject: [PATCH] winex11.drv: hack to allow changing the parent of virtual desktops diff --git a/patches/0024-do-not-rely-on-a-consistent-user-id.patch b/patches/0024-do-not-rely-on-a-consistent-user-id.patch index 2f70392..a2eca7f 100644 --- a/patches/0024-do-not-rely-on-a-consistent-user-id.patch +++ b/patches/0024-do-not-rely-on-a-consistent-user-id.patch @@ -1,4 +1,4 @@ -From cdd98a8d82956feea88ef874f47aa5e3a58072d4 Mon Sep 17 00:00:00 2001 +From 50f968f16662936823af1e7b92757d62eee2d6ad Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Wed, 8 Oct 2008 15:43:46 -0500 Subject: [PATCH] do not rely on a consistent user id @@ -13,10 +13,10 @@ id. 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c -index 145540f..01cfcde 100644 +index d16a248..fb5e2b1 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c -@@ -738,6 +738,7 @@ static void setup_config_dir(void) +@@ -689,6 +689,7 @@ static void setup_config_dir(void) { if (errno != ENOENT) fatal_perror( "chdir to %s\n", config_dir ); @@ -24,7 +24,7 @@ index 145540f..01cfcde 100644 if ((p = strrchr( config_dir, '/' )) && p != config_dir) { struct stat st; -@@ -751,6 +752,7 @@ static void setup_config_dir(void) +@@ -702,6 +703,7 @@ static void setup_config_dir(void) tmp_dir ); free( tmp_dir ); } @@ -32,7 +32,7 @@ index 145540f..01cfcde 100644 mkdir( config_dir, 0777 ); if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s\n", config_dir ); -@@ -834,8 +836,10 @@ static int server_connect(void) +@@ -785,8 +787,10 @@ static int server_connect(void) /* make sure we are at the right place */ if (stat( ".", &st ) == -1) fatal_perror( "stat %s", serverdir ); diff --git a/patches/0025-libwine-hard-code-the-username-because-Rainbow-like.patch b/patches/0025-libwine-hard-code-the-username-because-Rainbow-like.patch index dfcdf95..834dce1 100644 --- a/patches/0025-libwine-hard-code-the-username-because-Rainbow-like.patch +++ b/patches/0025-libwine-hard-code-the-username-because-Rainbow-like.patch @@ -1,4 +1,4 @@ -From 3e68266408c56a7f283c5c44d138226c5bb958e7 Mon Sep 17 00:00:00 2001 +From 574776034b782549b032b19f0b0f2e68aebae329 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Thu, 9 Oct 2008 11:37:20 -0500 Subject: [PATCH] libwine: hard-code the username because Rainbow likes to change it diff --git a/patches/0026-allow-other-users-in-the-same-group-to-share-a-wine.patch b/patches/0026-allow-other-users-in-the-same-group-to-share-a-wine.patch index aafcc0d..6587594 100644 --- a/patches/0026-allow-other-users-in-the-same-group-to-share-a-wine.patch +++ b/patches/0026-allow-other-users-in-the-same-group-to-share-a-wine.patch @@ -1,4 +1,4 @@ -From 4a93fb2acc672e8a3b6e9562c44056cd30930e37 Mon Sep 17 00:00:00 2001 +From 91e8c27ed8a4b0104aacb1468159e14b7d7af230 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Wed, 15 Oct 2008 12:44:16 -0500 Subject: [PATCH] allow other users in the same group to share a wine server @@ -10,10 +10,10 @@ Subject: [PATCH] allow other users in the same group to share a wine server 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c -index 01cfcde..26b0f4f 100644 +index fb5e2b1..542f34b 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c -@@ -860,7 +860,7 @@ static int server_connect(void) +@@ -811,7 +811,7 @@ static int server_connect(void) /* make sure the socket is sane (ISFIFO needed for Solaris) */ if (!S_ISSOCK(st.st_mode) && !S_ISFIFO(st.st_mode)) fatal_error( "'%s/%s' is not a socket\n", serverdir, SOCKETNAME ); diff --git a/patches/0027-default-to-150-dpi.patch b/patches/0027-default-to-150-dpi.patch index 199aafc..92c63e5 100644 --- a/patches/0027-default-to-150-dpi.patch +++ b/patches/0027-default-to-150-dpi.patch @@ -1,4 +1,4 @@ -From 82e4c2989dd680be57c3b2bfaecab4527bada902 Mon Sep 17 00:00:00 2001 +From 9358075eee2f9b59b979686867a15b96235c92cb Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Wed, 15 Oct 2008 16:51:17 -0500 Subject: [PATCH] default to 150 dpi @@ -22,7 +22,7 @@ index 480486f..5cf913d 100644 if (RegOpenKeyW(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS) diff --git a/tools/wine.inf.in b/tools/wine.inf.in -index b53984d..9381f4a 100644 +index cf7e617..40d4e3b 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -312,7 +312,7 @@ HKLM,%FontSubStr%,"Times New Roman CE,238",,"Times New Roman,238" diff --git a/patches/0028-explorer-stay-out-of-the-sugar-hot-corners.patch b/patches/0028-explorer-stay-out-of-the-sugar-hot-corners.patch index 1207104..89fc38c 100644 --- a/patches/0028-explorer-stay-out-of-the-sugar-hot-corners.patch +++ b/patches/0028-explorer-stay-out-of-the-sugar-hot-corners.patch @@ -1,4 +1,4 @@ -From ccfc03ffde401312e3b66b2e8144abf4bf4ffa9f Mon Sep 17 00:00:00 2001 +From 100e3e472095d88e80ae447efe6300d4d2f881c3 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Fri, 17 Oct 2008 15:51:52 -0500 Subject: [PATCH] explorer: stay out of the sugar "hot corners" diff --git a/patches/0029-explorer-add-Run-from-Journal-to-start-menu.patch b/patches/0029-explorer-add-Run-from-Journal-to-start-menu.patch index 3880959..d520446 100644 --- a/patches/0029-explorer-add-Run-from-Journal-to-start-menu.patch +++ b/patches/0029-explorer-add-Run-from-Journal-to-start-menu.patch @@ -1,4 +1,4 @@ -From eb7277f8e45761ad82de87699d1fd091dfaf4ca8 Mon Sep 17 00:00:00 2001 +From e8bb8f3fe6a6c21267abea0d1a5492e9d365fc70 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Wed, 5 Nov 2008 13:36:35 -0600 Subject: [PATCH] explorer: add "Run from Journal" to start menu -- 2.11.4.GIT