Hi, Here's the list of patches on top of Alexandre's "origin" in my public Wine tree. You can pull the branch more easily after setting it up as follows: cat > .git/remotes/mmbranch <<EOF URL: http://mandoo.dyndns.org/wine.git Pull: refs/heads/master:refs/heads/mmbranch EOF Do the above once, then pull the branch with: git fetch mmbranch git pull . mmbranch I will try to keep this branch current until Alexandre returns and resumes committing patches to the WineHQ GIT tree. Happy hacking, Mike bash-3.00$ git log origin.. commit b470af661ea4cc0cf7118740cada503941f51c4f Author: Jason Green <jave27(a)gmail.com> Date: Fri Apr 28 10:22:13 2006 -0400 wined3d: Move _shader_program_dump_decl_usage() into baseshader.c commit 46a6380471e5efec03f86890efdf21d7eb69f7b5 Author: Phil Costin <philcostin(a)hotmail.com> Date: Fri Apr 28 14:41:45 2006 +0100 wined3d: Add check for GL Shading Language 100 Extension commit 43b61e573ebff04a42f8441f84ab8ffe1bd9dce8 Author: Huw D M Davies <h.davies1(a)physics.ox.ac.uk> Date: Fri Apr 28 14:50:11 2006 +0100 oleaut32: Implement GetDocumentation_Proxy/Stub commit 19607b31ac0794fbb3db18dc5123931c99b9c7ca Author: Huw D M Davies <h.davies1(a)physics.ox.ac.uk> Date: Fri Apr 28 14:48:38 2006 +0100 oleaut32: Implement GetFuncDesc_Proxy and friends commit b0f18ca8f0aea5ca048b6766429c68e6f86db72a Author: Huw D M Davies <h.davies1(a)physics.ox.ac.uk> Date: Fri Apr 28 14:42:43 2006 +0100 oleaut32: Implement GetTypeAttr_Proxy and friends commit 032d921bef8a25b8269526e0cd5bccf7dc69e4a0 Author: Huw D M Davies <h.davies1(a)physics.ox.ac.uk> Date: Fri Apr 28 14:28:24 2006 +0100 rpcrt4: support for non-encapsulated unions commit c4f12130f97f95720b35b13d55b334013cc3690b Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Fri Apr 28 14:35:36 2006 +0400 mlang: partially implemented ConvertStringEx commit 5fb48efc4e5cf4c7a2435c77fe69423fe141133e Author: Huw D M Davies <h.davies1(a)physics.ox.ac.uk> Date: Fri Apr 28 12:51:36 2006 +0100 gdi32: FcPatternGet( FC_FILE ) only returns the basename as of fontconfig 2.3.92 . commit 20909871737f9a17d9a2e5b7ce4d786e5a163eaf Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Fri Apr 28 05:23:52 2006 -0400 wined3d: Merge register counting pass for vertex/pixel shaders commit 98c7d831d0b84224a1c02efce7d8dd5461984763 Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Fri Apr 28 05:22:53 2006 -0400 wined3d: Make register counting pass the same for vertex/pixel shaders. commit 7fbeb0c289f2aed0a6328c88615da71c565a75f3 Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Fri Apr 28 04:57:24 2006 -0400 wined3d: Share get_register_code() commit 7653d5ce59a6f70c79db887dbf0a219a213b0979 Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 28 13:41:22 2006 +0900 rpcrt4: Add some defines. commit 7142c341423a72898c72d9fb7f4fd338507a7275 Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 27 20:52:12 2006 +0900 Add a stub implementation of mprapi.dll commit 80696aa9fc4703343bc4d08b9107aac51bb2a990 Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 27 20:53:19 2006 +0900 Add partial support for ISC_REQ_ALLOCATE_MEMORY in the NTLM security provider commit 68b097f7437c80cd2e141fd76926002931902abf Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 27 20:52:58 2006 +0900 Fix some wrong assumptions in the NTLM test case, make it pass in XP SP2 and Wine commit f5b8ea1c312fc783e12190f6235b346d6941f12e Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Thu Apr 27 12:23:18 2006 +0400 Fix union usage. commit 11b6680cbc5d87dd6be563c5b9b73278948e1e98 Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Wed Apr 26 12:30:02 2006 -0500 Implement EM_SETUNDOLIMIT commit 73cfc90caa5f644395f2c1f7a35edd9a8d19d81e Author: Juris Smotrovs <juris.smotrovs(a)sets.lv> Date: Tue Apr 25 19:06:10 2006 +0300 Added message sequences to test_mdi_messages of "msg" test to demonstrate problems with position change messages for MDI children with invisible parents. commit 8d70c5a81e8b18d100bf2d5323b8a5e44425d820 Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Tue Apr 25 11:27:29 2006 +0800 Update first visible when appropiate in the TVI_SORT case commit a12ed3de2a1b0e3f246224395d8dbbd17ca3f13b Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 25 22:51:09 2006 +0900 Store drop targets in a standard list. commit b5c46378217c63130e2b7d809b631b3257837199 Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Apr 26 15:43:54 2006 +0100 Implement the majority of ImpersonateLoggedOnUser commit 952c8a774f0415ca0a20c0f2430c98f0d37a8446 Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Apr 26 15:43:39 2006 +0100 Retrieve the groups for a token from the server commit ce098cb5c484e15ff4ca15d50de28e824121fcd1 Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Apr 26 15:44:14 2006 +0100 Initialise the LPWITHREADERROR structure after it has been allocated commit e6cb03f4ab0e7afed9a95099669a5f2cb2591400 Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Apr 26 15:42:35 2006 +0100 Threads should start off without having an impersonation token commit eeb9325ea9860c64c0853da723a0afc418d88a7f Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Apr 26 15:40:38 2006 +0100 Copy some format character types from wine/rpcfc.h to ndrtypes.h and change them into an enumeration commit 4b75cda7e45835bd13ac04fee89f99178ac11e01 Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Thu Apr 27 12:50:32 2006 +0900 Share get_opcode. commit b1130296853f0d34cbc6f586f01846b1fdca01f2 Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Thu Apr 27 12:23:43 2006 +0900 Clean up per version shader limits code commit 3a1cdd25ead6eb2d77e65bf26b20f73b27664063 Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Thu Apr 27 12:26:38 2006 +0900 Separate pshader/vshader tables commit 1ffb77dba1b1393d795c3e4f65958845b9feb521 Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Thu Apr 27 12:18:07 2006 +0900 Addline cleanup - unifies pixel shader addline() with vertexshader PSTRNCAT(), and puts the result into baseshader.c to be shared - merges its 3 arguments into a structure called SHADER_BUFFER - the varargs were based on Vitaliy Margolen's idea/patch, but I might have a diff. implementation commit b7736f01a1aed27726cc765045a85b3e62dbdf57 Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Thu Apr 27 12:12:40 2006 +0900 QueryInterface corrections. commit 60161b929083cdaf8fb415c66d0af001a96f5cc8 Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 26 22:42:13 2006 +0900 Add stub implementations for RPC authentication functions. commit 58a699b572c25efe69d10528fed0d40d3e6e7b50 Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Apr 26 18:25:43 2006 +0900 Mark the section with the program entry point as executable. commit 7bd41f92eb6b69e1554dd4f18b8bb58ea8551958 Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 26 18:19:09 2006 +0900 Fix peeking of http data with a nul byte in it. commit 1bf0b1641d910f1500116cd7f82157b2623e8d5d Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 26 14:13:52 2006 +0900 Use the source name of the msi package when it fails to copy. commit 6efcc3e0c4b89f90a2348ce4f860b04cf15236ed Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 26 00:55:51 2006 +0900 Force using /i file.msi, some programs pass properties without an = commit 6fa4ab4716f68a7a39ce58933719ea794980ce9f Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Tue Apr 25 22:44:54 2006 +0900 Implement 'oldnames' option. commit e225f57ee88b1adac6165c7ae562506861fe38f7 Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Sun Apr 23 21:09:30 2006 +0200 Don't append '\r' to the last paragraph in EM_GETTEXTEX commit c8ad36dd922b8251b533989d051c6fe8d44fbb16 Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Tue Apr 25 17:45:50 2006 +0900 Don't duplicate handle in _get_osfhandle commit 40c49959bfd462f678264bd9e4c21e331c603932 Author: Dan Kegel <dank(a)kegel.com> Date: Tue Apr 25 16:50:19 2006 +0900 Fix missing case in MsiSourceListAddSourceEx. commit 074af5529db005f0b5042b36525ca982242fbbba Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 25 16:31:52 2006 +0900 Add stubs for rpcrt4.NdrFullPointer*(). commit c8a43646881a839c943bd62787c056ce874ee283 Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Apr 25 13:21:00 2006 +0900 Vertex Shader regtype cleanups commit 61459b6e8e1ddbb206238e6925e00f841d137ac2 Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Tue Apr 25 13:12:47 2006 +0900 Fix a typo. commit 4d2944537b05fa0ceff923f67fe9ef59d9ed724b Author: Andras Kovacs <andras(a)csevego.net> Date: Tue Apr 25 00:58:39 2006 +0900 Translated regedit's Hu.rc file. commit 71d22e8d3f2a34569ce327566d0fa1c5a59feb0e Author: Andras Kovacs <andras(a)csevego.net> Date: Tue Apr 25 00:55:33 2006 +0900 Translated wordpad's Hu.rc file. commit 056e42487b317be4dc647b43aa0a20a54ff33609 Author: Andras Kovacs <andras(a)csevego.net> Date: Tue Apr 25 00:53:29 2006 +0900 Translated README file. commit bcfa41cd994e8636e7a6e7ae8c0e906c6421ec94 Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 18:38:40 2006 +0200 shdocvw: Don't use Mozilla ActiveX control id MSHTML is set. commit 9764e5c70501140b899a3a1e3ca636229ffd9f82 Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Apr 25 00:46:35 2006 +0900 Document the search functions. commit 0d6d824d2da47a92e76b2c5e529d389dfffe3458 Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 25 00:42:39 2006 +0900 Remove no longer needed includes. commit 4cc04cb95689a2bcec430d85f8ff20c0778123f5 Author: Robert Reif <reif(a)earthlink.net> Date: Tue Apr 25 00:29:20 2006 +0900 Add some lsa tests. commit 64cb4b42a7601036ac5c63d8bc56f390ed3ecc89 Author: Matthew Finnicum <mattfinn(a)gmail.com> Date: Mon Apr 24 23:50:45 2006 +0900 Implemented conformance tests for EM_SETUNDOLIMIT. commit afe16f21e06f76e8ef95b1fdf6eda60e21d004a6 Author: Robert Reif <reif(a)earthlink.net> Date: Mon Apr 24 23:54:49 2006 +0900 Fix LsaClose to return STATUS_SUCCESS.
Mike McCormack wrote:
Here's the list of patches on top of Alexandre's "origin" in my public Wine tree. You can pull the branch more easily after setting it up as follows:
cat > .git/remotes/mmbranch <<EOF URL: http://mandoo.dyndns.org/wine.git Pull: refs/heads/master:refs/heads/mmbranch EOF
Do the above once, then pull the branch with:
git fetch mmbranch git pull . mmbranch
Eep. Cogito on Gentoo is broken: ==================== # cg clone git://source.winehq.org/git/wine.git wine-git [ ... snip ...] # cd wine-git # cg-branch-add mmbranch http://mandoo.dyndns.org/wine.git Fetching head... Fetching objects... /usr/bin/cg-fetch: line 152: git-http-fetch: command not found cg-fetch: objects fetch failed ==================== While Cogito's syntax is definitely broken ("cg clone" vs. "cg-branch-add" eg.), I do find that it's still much much better than Git's. I've played with getwinegit.sh too, but I don't think it can fetch branches. If it's not too much work for you, could you set up git:// access to your branch? I think that would work better with Cogito..
Molle Bestefich wrote:
Eep. Cogito on Gentoo is broken: [snip] If it's not too much work for you, could you set up git:// access to your branch?
Oops, never mind that. Enabling "curl" and "webdav" USE flags on Gentoo makes git-http-fetch work. (Also causes my HTTP server to compile with WebDAV support and various other side effects, but hey, welcome to Gentoo and the world of multi-app use flags...)
On Saturday, April 29, 2006 09:11, Molle Bestefich wrote:
Molle Bestefich wrote:
Eep. Cogito on Gentoo is broken:
[snip]
If it's not too much work for you, could you set up git:// access to your branch?
Oops, never mind that. Enabling "curl" and "webdav" USE flags on Gentoo makes git-http-fetch work.
(Also causes my HTTP server to compile with WebDAV support and various other side effects, but hey, welcome to Gentoo and the world of multi-app use flags...)
Do echo "dev-util/cogito curl webdav" >> /etc/portage/package.use to only enable those use flags for cogito. - Neil
Neil Skrypuch wrote:
echo "dev-util/cogito curl webdav" >> /etc/portage/package.use
to only enable those use flags for cogito.
Neat, thanks for the info! *bookmarks conversation...* I'm using 'ufed' to define the flags though, since that's the easiest way to browse the hundreds of flags available and select/deselect them. (Aside from Kuroo, but I cannot get Kuroo to do the equivalent of "emerge -D world", so it got scrapped). Hmm. I think I'll live with the discrepancies until someone comes up with a working GUI.
participants (3)
-
Mike McCormack -
Molle Bestefich -
Neil Skrypuch