wine-devel January 2006

wine-devel@winehq.org

161 participants
302 discussions

Re: MSVCRT: stub implementation for wcsftime
by Marcus Meissner 20 Jan '06

20 Jan '06

On Fri, Jan 20, 2006 at 11:55:22AM +0100, Hans Leidekker wrote: > > I just saw an application crash on this unimplemented stub getting > called via some version of the mfc dll. > > -Hans > > Changelog > Stub implementation for wcsftime. Please output at least a fixme! Ciao, Marcus

1 0

Re: Fwd: dlls/wined3d/device.c GetCreationParameters
by Jacek Caban 20 Jan '06

20 Jan '06

Hello. Al Tobey wrote: > According to MSDN, this just sets a pointer to the creation > parameters. The attached patch makes this function work, but I'm > not sure if returning a pointer to the original parameters is the > right approach or if they should be copied first. > > This patch makes a bunch of the Ogre3d demos work, which are great for > testing since you can run the same demo in OpenGL, D3D9, and D3D7 > modes. > > The attached version incorporates all of the feedback from wine-devel > and should be ready to go. > > -Al Tobey > > ------------------------------------------------------------------------ > > diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c > index b057a36..f1bfc01 100644 > --- a/dlls/wined3d/device.c > +++ b/dlls/wined3d/device.c > @@ -6129,26 +6129,23 @@ > IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; > /** FIXME: always true at the moment **/ > if(bEnableDialogs == FALSE) { > FIXME("(%p) Dialogs cannot be disabled yet\n", This); > } > return D3D_OK; > } > > - > HRESULT WINAPI IWineD3DDeviceImpl_GetCreationParameters(IWineD3DDevice *iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { > IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; > > - FIXME("(%p) : stub\n", This); > You should change it to TRACE instead of deleting debug messages. > - /* Setup some reasonable defaults */ > - pParameters->AdapterOrdinal = 0; /* always for now */ > - pParameters->DeviceType = D3DDEVTYPE_HAL; /* always for now */ > - pParameters->hFocusWindow = 0; > - pParameters->BehaviorFlags =0; > + if (This == NULL || pParameters == NULL) > You really shouldn't check if This is NULL here. I'm sure this patch won't be applied with this. > + return D3DERR_INVALIDCALL; > + > + memcpy(pParameters, &This->createParms, sizeof(D3DDEVICE_CREATION_PARAMETERS)); > return D3D_OK; > } > > void WINAPI IWineD3DDeviceImpl_SetGammaRamp(IWineD3DDevice * iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) { > IWineD3DSwapChain *swapchain; > HRESULT hrc = D3D_OK; > > TRACE("Relaying to swapchain\n"); > Thanks, Jacek

1 0

Accessing gdi32.dll functions from another dll
by Jeff L 20 Jan '06

20 Jan '06

I need a bit of help with the correct way to do this. In usp10.c I need to access GetGlyphIndicesW. Given that it is part of gdi32, I assume that I will need to reference the function in the gdi32.dll rahter than linking it into usp10.dll. What is the approved method of setting up the access? Jeff

2 1

Accessing gdi32.dll functions from another dll
by Jeff L 20 Jan '06

20 Jan '06

1 0

regarding linux unicode
by kgupta＠in.safenet-inc.com 20 Jan '06

20 Jan '06

Hi , I am using tchar.h in windows and in linux it is not supporting. i want to use _TEXT for unicode compatibility so please tell me in which header file _TEXT is defined for unicode compatibility. Is _TEXT present in Linux? regards, kapil

2 1

Invisible fonts - unimplemented SPI_GETFONTSMOOTHINGTYPE
by Peter Åstrand 19 Jan '06

19 Jan '06

I'm trying to get the application "Nya Multigram" (http://www.softogram.se/multigramkunskapsbanken.html) running in Wine. It works somewhat, but the initial screen (which should look like http://www.softogram.se/grafik/multigramkunskapsbanken/mgkbscreenshot4.jpg) doesn't have any text. The buttons are rendered very slowly, and this error message appears: fixme:system:SystemParametersInfoW Unimplemented action: 8202 (SPI_GETFONTSMOOTHINGTYPE) A screenshot is available at http://www.cendio.com/~peter/multigram.png. A partial log when running with WINEDEBUG=+font,+nativefont,+wc_font is included below. Any ideas on how to solve this? trace:font:GetTextMetricsW text metrics: Weight = 700 FirstChar = 32 AveCharWidth = 16 Italic = 0 LastChar = 64258 MaxCharWidth = 16 UnderLined = 0 DefaultChar = 0 Overhang = 0 StruckOut = 0 BreakChar = 32 CharSet = 0 PitchAndFamily = 36 -------------------- InternalLeading = 4 Ascent = 24 Descent = 6 Height = 30 fixme:system:SystemParametersInfoW Unimplemented action: 8202 (SPI_GETFONTSMOOTHINGTYPE) trace:font:WineEngCreateFontInstance L"System", h=16, it=0, weight=400, PandF=22, charset=0 orient 0 escapement 0 trace:font:WineEngCreateFontInstance returning cached gdiFont(0x7fe9b888) for hFont 0x7c trace:font:X11DRV_SelectFont hdc=0x1154, hfont=0x7c trace:font:X11DRV_SelectFont gdiFont = 0x7fe9b888 trace:font:WineEngCreateFontInstance L"System", h=16, it=0, weight=400, PandF=22, charset=0 orient 0 escapement 0 trace:font:WineEngCreateFontInstance returning cached gdiFont(0x7fe9b888) for hFont 0x7c trace:font:X11DRV_SelectFont hdc=0x2284, hfont=0x7c trace:font:X11DRV_SelectFont gdiFont = 0x7fe9b888 trace:font:X11DRV_SelectFont hdc=0x2284, hfont=0x7c trace:font:X11DRV_SelectFont gdiFont = 0x7fe9b888 trace:font:X11DRV_SelectFont hdc=0x2284, hfont=0x7c trace:font:X11DRV_SelectFont gdiFont = 0x7fe9b888 trace:font:X11DRV_SelectFont hdc=0x2284, hfont=0x7c trace:font:X11DRV_SelectFont gdiFont = 0x7fe9b888 trace:font:WineEngCreateFontInstance L"Arial", h=31, it=0, weight=700, PandF=00, charset=0 orient 0 escapement 0 trace:font:WineEngCreateFontInstance returning cached gdiFont(0x7b7abd70) for hFont 0xec8 trace:font:X11DRV_SelectFont hdc=0x2218, hfont=0xec8 trace:font:X11DRV_SelectFont gdiFont = 0x7b7abd70 trace:font:X11DRV_SelectFont hdc=0x1154, hfont=0x7c trace:font:X11DRV_SelectFont gdiFont = 0x7fe9b888 trace:font:WineEngCreateFontInstance L"Arial", h=31, it=0, weight=700, PandF=00, charset=0 orient 0 escapement 0 trace:font:WineEngCreateFontInstance returning cached gdiFont(0x7b7abd70) for hFont 0xec8 trace:font:X11DRV_SelectFont hdc=0x1154, hfont=0xec8 trace:font:X11DRV_SelectFont gdiFont = 0x7b7abd70 -- Peter Åstrand ThinLinc Chief Developer Cendio www.cendio.se Teknikringen 3 583 30 Linköping Phone: +46-13-21 46 00

4 12

ntoskrnl status with patch against wine-0.9.6
by Vitaliy Margolen 19 Jan '06

19 Jan '06

I'm sure number of people wonder where did ntoskrnl go. It's till here in the too hackish form to be committed. For the past month it didn't even compile because of all the changes to different parts of Wine. I just thought I should put it back together and see if it's still working. And surprise surprise it still works. So here it is again, before I'll brake it again re-implementing the way the user space talks to it. BTW, it is still just barely enough to run safedisc 1.x copy-protection. Diff against wine-0.9.6 -- Best regards, Vitaliy

1 0

Please read: Wine(HQ) needs a reorganization (AppDB, Bugzilla, etc.)
by S. Schauenburg 19 Jan '06

19 Jan '06

On IRC we started a chat on #WineHQ and discussed how to improve Wine. There were comments made and I wanted to summarize them and ask for your opinion. By the way: Who is in charge of WineHQ, AppDB etc.? A list of people who are responsible for that would be nice (it could be I've missed that one though). Back onto the main topic. Remarks made: 1. AppDB needs a revamp. Maybe drop the maintainers (those things just need to be set by developers only). Just have a look at the activity of all the maintainers in the last year. **Read on for suggestions to drop the AppDB. 2. Create a Wine forum. This solves the problem of users asking the same questions over and over again. Here also the "comments" of the AppDB could be centralized (because most of them aren't really comments) 3. With a forum in place, the user-mailing list could be dropped and maybe also even the devel-mailing list. 4. Create a Wine Wiki, instead of the AppDB. Only certain developers (or maybe users) can set/edit certain pages. Then also howto's could be inserted here. 5. It's too difficult for users to add a bugreport. Either create a small program/app which does it for the user (like "Submit this bugreport" *click*) and you're done. The other option is to create a simplified method for searching and inserting a bug report, because from a users view, there are too many options. (and probably the user wouldn't even know what to click on. Don't forget to give the users the option to 'add' a file with certain 'debug channels' (which ones? only +seh?) 6. Users need to know that if they submit a bug report (when it's simplified) that it actually HELPS you, the developers. So it's "Help us, help you". What's your opinion about this? In my eyes, it would greatly improve the user input/feedback and would even make Wine more popular. Regards, SWAT

19 27

TurboCash minimal test apps. BDE test works now!
by Dan Kegel 19 Jan '06

19 Jan '06

The nice folks at TurboCash have been trying to run TurboCash with Wine for a long time off and on. As of last year, they complained that Borland BDE didn't work with stock wine (see e.g. http://www.turbocashuk.com/Forums/index.php?s=203b0c6d3e3d67cd58fb7389167e7… ) They even went to the trouble of producing four little test apps, two for GUI stuff, and one each for BDE and MySQL. I tried the BDE one, and it seems to work now! Here's how to try them. I haven't worked out how to install mysql yet, perhaps somebody else could complete this script... Thanks, Dan # Point to your copy of wine WINEDIR=$HOME/cs130/ WINE=$WINEDIR/wine REGSVR32=$WINEDIR/programs/regsvr32/regsvr32 #WINE=wine #REGSVR32=regsvr32 # Start with a fresh fake Windows directory rm -rf ~/.wine # Install Borland's BDE # (See http://compkarori.com/dbase/bu09inno.htm ) wget -c http://www.jrsoftware.org/download.php/bdeinst.cab cabextract bdeinst.cab $REGSVR32 BdeInst.dll # Try TurboCash's minimal Wine test cases; see # http://www.turbocashuk.com/Forums/index.php?s=203b0c6d3e3d67cd58fb7389167e7… wget -c http://www.turbocash.nl/download/Controlstest.zip unzip Controlstest.zip # Test BDE (interactive app; works for me) $WINE Controlstest/SimleBDE.exe # Test MySQL (interactive app; doesn't even load, # it needs mysql40.dll or something like that, # and I haven't tried to install that yet) $WINE Controlstest/ZSimple.exe # There are two other test programs for gui controls; # they seem to run, but I haven't verified they behave # identically under wine and windows -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

ConnectNamedPipe Fix
by Robert Shearman 19 Jan '06

19 Jan '06

Hi all, Here is a patch to fix ConnectNamedPipe on a non-overlapped handle when an OVERLAPPED structure is passed in. I'm not sending it to wine-patches yet because the RPC code has not been fixed to work around this yet. ChangeLog: Return STATUS_PENDING from the connect_named_pipe call if the server was opened overlapped. STATUS_SUCCESS in the client code now indicates that the event must be waited on before returning. dlls/ntdll/file.c | 10 +++------- server/named_pipe.c | 2 ++ 2 files changed, 5 insertions(+), 7 deletions(-)

1 0

wine 0.9.5 - segmentation fault with some apps
by penna＠bb.com.br 19 Jan '06

19 Jan '06

Hi all, I have already posted this message at the wine-users list (sorry for the cross posting but I think this subject is related to devel people instead of users). I am trying to install ARS V4.5.1, from Remedy, using wine-0.9.5 for Mandriva (RPM built by Ivan). My Mandriva is 2006. If I try to run the installer (called "user.exe") wine segfaults immediately. So I run "WINEDEBUG=+all wine user.exe" just to get more information. Follows the end of the output just before the segfault: ------------------ 8< ------------------ 0009:trace:virtual:VIRTUAL_SetProt 0x7fbf5000-0x7fbf5fff c-rWx 0009:trace:virtual:VIRTUAL_DumpView View: 0x7fb20000 - 0x7fc3ffff (system) 0009:trace:virtual:VIRTUAL_DumpView 0x7fb20000 - 0x7fc3ffff c-rWx 0009:trace:module:load_builtin_callback loaded user32.dll 0x7fd84868 0x7fb20000 0009: load_dll( handle=(nil), base=0x7fb20000, size=1179648, dbg_offset=0, dbg_size=0, name=0x7fd84890, filename=L"c:\\windows\\system32\\user32.dll" ) 0009: load_dll() = 0 0009:trace:heap:RtlAllocateHeap (0x7fd80000,0000000a,000015f0): returning 0x7fd865a0 0009:Call ntdll.RtlAllocateHeap(7fd80000,00000000,0000001a) ret=7fce4f5f 0009:trace:heap:RtlAllocateHeap (0x7fd80000,00000002,0000001a): returning 0x7fd84908 0009:Ret ntdll.RtlAllocateHeap() retval=7fd84908 ret=7fce4f5f 0009:trace:nls:WideCharToMultiByte cp 0 L"user.exe" -> (null) 0009:Call ntdll.RtlAllocateHeap(7fd80000,00000000,00000011) ret=7fce4fb4 0009:trace:heap:RtlAllocateHeap (0x7fd80000,00000002,00000011): returning 0x7fd84930 0009:Ret ntdll.RtlAllocateHeap() retval=7fd84930 ret=7fce4fb4 0009:trace:nls:WideCharToMultiByte cp 0 L"user.exe" -> "user.exe" 0009:Call ntdll.RtlAllocateHeap(7fd80000,00000000,00000012) ret=7fce526d 0009:trace:heap:RtlAllocateHeap (0x7fd80000,00000002,00000012): returning 0x7fd84a08 0009:Ret ntdll.RtlAllocateHeap() retval=7fd84a08 ret=7fce526d 0009:Call ntdll.RtlImageNtHeader(00000000) ret=7fce61da 0009: *killed* exit_code=0 Segmentation Fault --------------------- 8< --------------------- I have ARS Remedy versions V3.0, V4.5.1, V5.1 and V5.1.2. The segfault problem happens with V4.5.1 and V5.1. Version 5.1.2 installs but has a different problem (it complains about permission even if I am the owner of the files and directories 8-P. I have checked and the owner has all permissions). Version 3.0 is too old and also complains (I do not remember right now what is the complaint). Please CC me because I am only subscribed at wine-users. Any clue/sugestions? More information? Thanks. --------------------------------------------------------- Ulisses de Sousa Penna Analista Consultor - Banco do Brasil Fone: +55-61-3310-6320 Fax: +55-61-3310-6435 ---------------------------------------------------------

2 1

Re: Internet Explorer 6.0 SP1 fails on CVS
by Henry Kroll 19 Jan '06

19 Jan '06

> Internet Explorer 6.0 SP1 fails on CVS Well, I wrote a stub patch for this already and submitted it to wine-patches. It's probably wrong and not in the correct format but it works for me. Cheers! Henry

1 0

Fwd: wiki.winehq.org
by Ivan Leo Puoti 19 Jan '06

19 Jan '06

---------- Forwarded message ---------- From: Ebenezer <ben_kelley(a)users.sourceforge.net> Date: 18-Jan-2006 23:31 Subject: wiki.winehq.org To: ivanleo(a)users.sourceforge.net Cc: ben_kelley(a)users.sourceforge.net Message body follows: Hi. I saw some stuff about WINE benchmark performance on digg.com, but when I went to go to the site I found that my company's proxy blocks the site. I don't expect you to be able to do anything about this - I just thought you might find it amusing. I believe we use SmartFilter from Secure Computing (http://www.securecomputing.com/). It classifies http://wiki.winehk.org/ as Alcohol and Hacking for version 4 of their software, and "Mature topics" in version 3. I checked http://winehq.org/, and it is "Computing/Internet" for version 4, and unclassified in version 3. (I sent Secure Computing some feedback suggesting that they should probably reclassify http://wiki.winehq.org/ !) - Ben Kelley. -- This message has been sent to you, a registered SourceForge.net user, by another site user, through the SourceForge.net site. This message has been delivered to your SourceForge.net mail alias. You may reply to this message using the "Reply" feature of your email client, or using the messaging facility of SourceForge.net at: https://sourceforge.net/sendmessage.php?touser=464040

1 0

Re: advpack tests
by Detlef Riekenberg 19 Jan '06

19 Jan '06

Am Dienstag, den 17.01.2006, 23:42 +0100 schrieb Stefan Leichter: > this patch should fix > http://test.winehq.org/data/200601171000/xp_dr.ie6/advpack:advpack.txt > and > http://test.winehq.org/data/200601171000/xp_alx-winxp-17-jan-2k6/ > advpack:advpack.txt > > but i can not test it myself because the tests are not executed on my win2k > box. I'm unable to test this atm. mingw failed in advpack/tests with "-lcabinet" (File not found). (newest binary from http://mirzam.it.vu.nl/mingw/ ) -- By By ... ... Detlef

2 1

Re: mscms: check an appropriate registry key.
by James Hawkins 19 Jan '06

19 Jan '06

On 1/18/06, Saulius Krasuckas <saulius2(a)ar.fi.lt> wrote: > + > + hkIcmKey = reg_open_mscms_key(); > + if (!hkIcmKey) > + { > + trace("Key 'HKLM\\SOFTWARE\\Microsoft\\Windows*\\CurrentVersion\\ICM\\RegisteredProfiles' not found\n" ); > + return; > + } We shoul fail silently here. If the key isn't found, just return. > + > + ok( dwType == REG_SZ, "RegEnumValueA() returned unexpected value type (%ld)\n", dwType ); > + if (dwType != REG_SZ) break; > + trace(" found '%s' value containing '%s' (%d chars)\n", szName, szData, strlen(szData)); > + } > + Why do you need to output this information? If you're expecting certain values, do an 'ok' on them. On a successful run of the tests, the only output should be the number of tests that were fun, and that all of them succeeded, or if any failed, output the tests that failed. -- James Hawkins

3 3

Wine on SuSE 10 and German Umlauts
by Roland Kaeser 19 Jan '06

19 Jan '06

Hello I'm new in this list. I'm the Application Maintainer of Corel Draw 9 and Railroad Tycoo3 so I hope I'm ready to discuss with the developers on a equal level. I have a very strange behaviour when using wine (the original suse rpm, the compiled source code (release or cve)) on SuSE 10 on a Intel ia32 machine. All Windows Programs (running on wine) don't accept german umlauts (äöü) keys. The rest of system (console, X-Window System) accepts it (as Yours can see in the mail). Does somebody has a idea about the reason behind this behaviour? Many Thanks Roland Kaeser ___________________________________________________________ Telefonate ohne weitere Kosten vom PC zum PC: http://messenger.yahoo.de

3 4

CVS build error on RH9
by Robert Reif 19 Jan '06

19 Jan '06

This patch: http://www.winehq.org/pipermail/wine-cvs/2006-January/020350.html doesn't compile on RH9. make[2]: Entering directory `/home/wine/wine/dlls/d3d8' gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o device.o device.c device.c: In function `IDirect3DDevice8Impl_SetRenderState': device.c:3087: `GL_ARB_point_sprite' undeclared (first use in this function) device.c:3087: (Each undeclared identifier is reported only once device.c:3087: for each function it appears in.) device.c:3088: `GL_POINT_SPRITE_ARB' undeclared (first use in this function) make[2]: *** [device.o] Error 1 make[2]: Leaving directory `/home/wine/wine/dlls/d3d8'

3 4

Internet Explorer 6.0 SP1 fails on CVS
by Henry Kroll 19 Jan '06

19 Jan '06

For the past 2 weeks, IE6 has been failing to load under CVS. It works fine on wine <= .9.5, however. And other apps work no problem. The error I get is: fixme:toolbar:TOOLBAR_CheckStyle [0x10032] TBSTYLE_REGISTERDROP not implemented fixme:toolbar:TOOLBAR_CheckStyle [0x10032] TBSTYLE_REGISTERDROP not implemented fixme:shell:NTSHChangeNotifyRegister (0x10032,0x00008003,0x00008000,0x0000c070,0x00000001,0x55c3ddc8):semi stub. fixme:toolbar:TOOLBAR_Unkwn45D hwnd=0x10032, wParam=0x00000000, size.cx=1280, size.cy=32000 stub! fixme:toolbar:TOOLBAR_CheckStyle [0x10032] TBSTYLE_REGISTERDROP not implemented fixme:toolbar:TOOLBAR_CheckStyle [0x10032] TBSTYLE_REGISTERDROP not implemented fixme:toolbar:TOOLBAR_Unkwn464 hwnd=0x10036 wParam 00000001 lParam 00000000 err:rebar:REBAR_Layout no redraw and client is zero, skip layout wine: Call from 0x55861bf0 to unimplemented function kernel32.dll.BaseCheckAppcompatCache, aborting fixme:imm:ImmDisableIME (-1): stub I think it wants a stub for BaseCheckAppcompatCache. Henry

1 0

Re: winspool/tests: dump filename and version of the tested file
by James Hawkins 19 Jan '06

19 Jan '06

On 1/17/06, Detlef Riekenberg <wine.dev(a)web.de> wrote: > > Changelog: > - winspool/tests: dump filename and version of the tested file > - use <name> for all includes > We generally have a policy of silence for the test suite unless a failure occurrs. Why do you need to output the version tested? -- James Hawkins

3 5

Re: [bug 4004] MenuItemInfo vs GetMenuString
by Dmitry Timoshkov 18 Jan '06

18 Jan '06

"Ann & Jason Edmeades" <us(a)edmeades.me.uk> wrote: > Copy and store the dwTypeData of a menu item even for a ownerdraw item, and > ensure the memory allocations/freeing occurs correctly > + /* Just change ftype to string and see what text is stored */ > + memset(&info, 0x00, sizeof(info)); > + info.cbSize= sizeof(MENUITEMINFO); > + info.fMask= MIIM_FTYPE; /* Set string type */ > + info.fType= MFT_STRING; > + info.dwTypeData= (char *)0xdeadbeef; > + SetMenuItemInfo( hmenu, 0, TRUE, &info ); > + > + /* Did we keep the old dwTypeData? */ > + ok (GetMenuString( hmenu, 0, strback, 99, MF_BYPOSITION), "GetMenuString on ownerdraw entry failed\n"); > + ok (!strcmp( strback, "Dummy string" ), "Menu text from Ansi version incorrect\n"); > + > + /* Just change ftype to bitmap and back to ensure data isnt freed */ > + memset(&info, 0x00, sizeof(info)); > + info.cbSize= sizeof(MENUITEMINFO); > + info.fMask= MIIM_FTYPE; /* Set as bitmap type */ > + info.fType= MFT_BITMAP; > + info.dwTypeData= (char *)0xdeadbee2; > + SetMenuItemInfo( hmenu, 0, TRUE, &info ); > + info.fType= MFT_OWNERDRAW; /* Set as ownerdraw type */ > + info.dwTypeData= (char *)0xdeadbee3; > + SetMenuItemInfo( hmenu, 0, TRUE, &info ); You don't check SetMenuItemInfo return code after the above calls and I very much suspect that they fail leading to the observed results. -- Dmitry.

5 15

FWD: Wine on SuSE 10 and German Umlauts
by Roland Kaeser 18 Jan '06

18 Jan '06

1 0

Re: GIT rebase changes
by Eric POUECH 18 Jan '06

18 Jan '06

why don't you guys use stg (stacked git) it allows you to manage a set of patches, with features like : - re-edit an existing one (basically, you push/pull a set of patches from a stack, and decide which one to use) - you get the upside of git, without the down side (ie a commit is done only once) (but you can still commit a patch - in git sense ; but you'll get back Mike's first point about pull/fetch discussion) - you don't need to rebase (it does it for you) - you don't need to coalesce patches (as you can reedit an existing one) - it's compatible with some other tools (like qgit) basically, I switched to stg - on top of git - when I got my tree messed up twice by updates... If you go for stg, I also recommend the bash completion extension which is very helpful (for patch name's management) my 2 cents > Message du 18/01/06 17:39 > De : "Robert Shearman" > A : "Mike McCormack" > Copie à : "Wine Devel" > Objet : Re: GIT rebase changes > > Mike McCormack wrote: > > > > > Hi GIT users, > > > > The GIT guys have made rebase and pull incompatible, and to use rebase > > (which is likely what we want to do for Wine), you must use "fetch" > > then "rebase", not "pull" (which does a merge). > > > And on a slightly related note, I wrote a script which works kinda like > rebase (and is based on the old version of rebase) that allows you to > coalesce two patches in your tree. This is useful in two situations: > 1. You commit a new feature and then realise after some extensive > testing that there is a bug, so you commit a fix, don't want to send the > two separate patches to wine-patches (maybe to save face :-), or maybe > to reduce noise). > 2. You revert a patch in your tree but don't want both the revert and > the old patch in your patch queue as shown by git-format-patch or by > Mike's mm-send-patch. > > Note that the first commit chronologically must be the first commit on > the command line. > > -- > Rob Shearman > > > > [ rob-git-coalesce-patches (2.5 Ko) ] > [ (pas de nom de fichier) (0.0 Ko) ]

1 0

GIT rebase changes
by Mike McCormack 18 Jan '06

18 Jan '06

Hi GIT users, The GIT guys have made rebase and pull incompatible, and to use rebase (which is likely what we want to do for Wine), you must use "fetch" then "rebase", not "pull" (which does a merge). See: http://article.gmane.org/gmane.linux.kernel/365410 The error message that you get if you use "pull" then try to "rebase" with newer version of GIT is pretty useless: bash-3.00$ git-rebase origin Current branch refs/heads/master is up to date. So use "git-fetch" to update origin, then "git-rebase origin" after that to get the new changes. I've update the Wiki with that information - don't shoot the messenger :/ Mike

3 3

Re: [D3D8] fix compile error for missing GL define
by H. Verbeet 18 Jan '06

18 Jan '06

On 18/01/06, Robert Reif <reif(a)earthlink.net> wrote: > I don't know the best way to handle this but this patch does get it to > compile again. Fixing it that way makes it a compile time check instead of a runtime check. I think the idea was for d3d to check extension support during runtime. include/wine/wined3d_gl.h has defines for GL_ARB_point_sprite etc, but as far as I know it doesn get included by d3d8. For d3d8, it should probably be defined in dlls/d3d8/d3dcore_gl.h (it isn't right now).

1 0

Re: PATCH/RFC: defer OLE apartment window creation
by Marcus Meissner 18 Jan '06

18 Jan '06

On Wed, Dec 21, 2005 at 02:55:14AM +0000, Robert Shearman wrote: > Marcus Meissner wrote: > > >@@ -257,6 +254,15 @@ > > return apt; > >} > > > >+void make_apartment_window(APARTMENT *apt) { > >+ if (apt->win) return; > >+ if (!(apt->model & COINIT_APARTMENTTHREADED)) > >+ return; > >+ apt->win = CreateWindowW(wszAptWinClass, NULL, 0, > >+ 0, 0, 0, 0, > >+ 0, 0, OLE32_hInstance, NULL); > >+} > >+ > > > > This isn't thread-safe. It would also be better to make this an accessor > function for the win field of struct apartment and fix up all callers to > use this. I still have to verify on Windows whether this is what it does > or whether it does something funny with message loops. I lack the time and testing abilities to do this right now (and now on xmas break). Its just a quick hack to get Google Earth running. It is now up to showing the famous GL "black screen". :( (WINEDLLOVERRIDES=*usp10=n) Ciao, Marcus

2 2

← Newer
1
2
3
4
5
6
7
8
9
...
13
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-devel January 2006