wine-devel

wine-devel@winehq.org

11 participants
84462 discussions

Start a nNew thread

Re: Resend: Re-implement MSVCRT *printf functions
by Aneurin Price 28 Nov '04

28 Nov '04

Any further comments on this?

4 6

Translate dir names into Spanish
by Joaquín Fernández 28 Nov '04

28 Nov '04

Hi I have some programs in spanish for windows but when i install it i have problems with dir names, for example "Program Files" is "Archivos de programa", "Common Files" is "Archivos comunes", and so. Can i translate this names in source and compiling without problem?? which files i need update?? Can i translate Wine into spanish?? How? Regards Joaquín -- -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.2.4 (GNU/Linux) mQFCBEFI/gARAwDd2+ojasT3rCyRktSw+Ix3m+yoxSD0NkpMLlunmJxwvn6wKZVl mDw76/Zu9mqDWWeSGdSl+60T7fDLrJZSEB45O9T5jdujj01GFeer7xuiuHBTFw8o CXqD/hzhqYc46ecAoIQQjZ2qZtOWLPRBbegK/nyOIguNAv9QGiKPLBS8o0ksxEUp EfLAExVmu6Zp693uKGf6XrBWNcLriuwRPr1mjy3N/bhMlqc3vcTeUBwxiUuX5h2P NQgB3d2AbJS6oEvhmZL0Bn/8Ij/MSvVrartmCXuw9eSx0aMC/R7Kw9TtUfxFVUGx fQKwoA9BXNElPLcNohbBS/fH87IMMxCJyn+rmTeNCEcUEQ7UgvVCdlzZ8+L4PdlH qGR81nhZVEwPRnSSesLpSHRC1QQVoceBeb7PICr/b2eZiKMX+bQ+Sm9hcXXDrW4g TWFudWVsIEZlcm7DoW5kZXogUXVpbGVzIDxqb2FxdWluQGNhc2FkZWFsYWJhbnph Lm9yZz6IXgQTEQIAHgUCQUj+AAIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRBH 677/q7xL4e15AJwNfSpeaXXMH2EjuKblfeBe51MrUgCcCP5jEnpXrDXLWULIW5yD t6VdHlU= =a8BM -----END PGP PUBLIC KEY BLOCK-----

1 0

Re: Unicodified fontdlg (next try)
by Robert Shearman 26 Nov '04

26 Nov '04

Jacek Caban wrote: > Changelog: > Unicodified fontdlg > >------------------------------------------------------------------------ > >@@ -216,52 +213,60 @@ > */ > BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont) > { >- LPCVOID template; >- HRSRC hResInfo; >- HINSTANCE hDlginst; >- HGLOBAL hDlgTmpl; >- >- if ( (lpChFont->Flags&CF_ENABLETEMPLATEHANDLE)!=0 ) >- { >- template=(LPCVOID)lpChFont->hInstance; >- } else >- { >- if ( (lpChFont->Flags&CF_ENABLETEMPLATE)!=0 ) >- { >- hDlginst=lpChFont->hInstance; >- if( !(hResInfo = FindResourceA(hDlginst, lpChFont->lpTemplateName, >- (LPSTR)RT_DIALOG))) >- { >- COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); >- return FALSE; >- } >- } else >- { >- hDlginst=COMDLG32_hInstance; >- if (!(hResInfo = FindResourceA(hDlginst, "CHOOSE_FONT", (LPSTR)RT_DIALOG))) >- { >- COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); >- return FALSE; >- } >- } >- if (!(hDlgTmpl = LoadResource(hDlginst, hResInfo )) || >- !(template = LockResource( hDlgTmpl ))) >- { >- COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); >- return FALSE; >- } >+ CHOOSEFONTW chFontw; >+ LOGFONTW logFontw; >+ LPLOGFONTA lpLogFonta; >+ int len; >+ BOOL ret; >+ LPSTR lpszStyle; >+ LPCSTR lpTemplateName; >+ >+ memcpy(&chFontw, lpChFont, sizeof(CHOOSEFONTW)); >+ memcpy(&logFontw, lpChFont->lpLogFont, sizeof(LOGFONTA)); >+ chFontw.lpLogFont = &logFontw; >+ >+ MultiByteToWideChar(CP_ACP, 0, lpChFont->lpLogFont->lfFaceName, >+ LF_FACESIZE, chFontw.lpLogFont->lfFaceName, LF_FACESIZE); >+ >+ if(lpChFont->lpszStyle) { >+ len = MultiByteToWideChar(CP_ACP, 0, lpChFont->lpszStyle, -1, NULL, 0); >+ chFontw.lpszStyle = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(WCHAR)); > > Initialising the whole string to zero just before it is about to be overwritten seems needlessly wasteful on CPU cycles and memory bandwidth. You seem to do this in a few places. Yes, MultiByteToWideChar can, in some cases, leave the string without a null terminator, but that only happens when there is insufficient buffer. In this case, the only way that can happen is if another thread modifies the buffer between the previous MultiByteToWideChar and the next one here. If you wanted to be really careful, you could always add "chFontw.lpszStyle[len-1] = '\0';" after to call to MultiByteToWideChar. >+ MultiByteToWideChar(CP_ACP, 0, lpChFont->lpszStyle, -1, chFontw.lpszStyle, len); >+ HeapFree(GetProcessHeap(), 0, lpChFont->lpszStyle); > > You seem to be freeing a buffer that the user passed in. How do you know it was allocated with HeapAlloc? >+ } >+ >+ if(lpChFont->lpTemplateName) { >+ len = MultiByteToWideChar(CP_ACP, 0, lpChFont->lpTemplateName, -1, NULL, 0); >+ chFontw.lpTemplateName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(WCHAR)); >+ MultiByteToWideChar(CP_ACP, 0, lpChFont->lpTemplateName, >+ -1, (LPWSTR)chFontw.lpTemplateName, len); >+ } >+ >+ ret = ChooseFontW(&chFontw); >+ >+ lpLogFonta = lpChFont->lpLogFont; >+ lpszStyle = lpChFont->lpszStyle; >+ lpTemplateName = lpChFont->lpTemplateName; >+ memcpy(lpChFont, &chFontw, sizeof(CHOOSEFONTA)); >+ lpChFont->lpLogFont = lpLogFonta; >+ lpChFont->lpszStyle = lpszStyle; >+ lpChFont->lpTemplateName = lpTemplateName; >+ memcpy(lpChFont->lpLogFont, &logFontw, sizeof(LOGFONTA)); >+ WideCharToMultiByte(CP_ACP, 0, logFontw.lfFaceName, >+ LF_FACESIZE, lpChFont->lpLogFont->lfFaceName, LF_FACESIZE, 0, 0); >+ >+ if(chFontw.lpszStyle) { >+ len = WideCharToMultiByte(CP_ACP, 0, chFontw.lpszStyle, -1, NULL, -1, 0, 0);; >+ WideCharToMultiByte(CP_ACP, 0, chFontw.lpszStyle, -1, lpChFont->lpszStyle, len, 0, 0); >+ HeapFree(GetProcessHeap(), 0, chFontw.lpszStyle); > } >- if (TRACE_ON(commdlg)) >- _dump_cf_flags(lpChFont->Flags); > >- if (lpChFont->Flags & (CF_SELECTSCRIPT | CF_NOVERTFONTS )) >- FIXME(": unimplemented flag (ignored)\n"); >+ if(chFontw.lpTemplateName) >+ HeapFree(GetProcessHeap(), 0, (LPBYTE)chFontw.lpTemplateName); > > You shouldn't need a cast here, unless lpTemplateName is a const. > >- return DialogBoxIndirectParamA(COMDLG32_hInstance, template, >- lpChFont->hwndOwner, FormatCharDlgProcA, (LPARAM)lpChFont ); >+ return ret; > } > >- > #define TEXT_EXTRAS 4 > #define TEXT_COLORS 16 > > > ... >@@ -1072,34 +1083,34 @@ > } > > /*********************************************************************** >- * FormatCharDlgProcA [internal] >+ * FormatCharDlgProc [internal] > */ >-INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, >+INT_PTR CALLBACK FormatCharDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, > LPARAM lParam) > { >- LPCHOOSEFONTA lpcf; >+ LPCHOOSEFONTW lpcf; > INT_PTR res = FALSE; > > if (uMsg!=WM_INITDIALOG) > { >- lpcf=(LPCHOOSEFONTA)GetPropA(hDlg, WINE_FONTDATA); >- if (!lpcf && uMsg != WM_MEASUREITEM) >+ lpcf=(LPCHOOSEFONTW)GetPropW(hDlg, strWineFontData); >+ if (!lpcf) > return FALSE; > if (CFn_HookCallChk32(lpcf)) >- res=CallWindowProcA((WNDPROC)lpcf->lpfnHook, hDlg, uMsg, wParam, lParam); >+ res=CallWindowProcW((WNDPROC)lpcf->lpfnHook, hDlg, uMsg, wParam, lParam); > > This isn't something wrong with your patch, but is in the original code too. We shouldn't need to cast here, because if lpfnHook isn't using the right calling conventions or doesn't have the same number of parameters then we shouldn't be using CallWindowProc to start with. > if (res) > return res; > } > else > { >- lpcf=(LPCHOOSEFONTA)lParam; >+ lpcf=(LPCHOOSEFONTW)lParam; > if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf)) > { > TRACE("CFn_WMInitDialog returned FALSE\n"); > return FALSE; > } > if (CFn_HookCallChk32(lpcf)) >- return CallWindowProcA((WNDPROC)lpcf->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam); >+ return CallWindowProcW((WNDPROC)lpcf->lpfnHook,hDlg,WM_INITDIALOG,wParam,lParam); > } > switch (uMsg) > { > > Rob

1 0

Re: profiling GTA4. question about polling
by Brian Gunlogson 26 Nov '04

26 Nov '04

The patch you gave me is too incomplete to run GTA :( I can start a game, but once the loading screen says it is done, the game crashes. Looked at the console, it says, "fixme:drawStridedFast TODO". The crash happens at the end of drawStridedFast(), inside glDrawElements(). Your patch will really speed things up when it is finished. In a fresh CVS tree, I disabled drawStridedSlow and applied 2 polling patches submitted to wine-patches. The game works almost as fast as in Windows!! Brian G. --- Raphael <fenix(a)club-internet.fr> wrote: > Here is it. > > But i have some problems with hardware vertex buffers (using vbo extension) > i have some 'transparent" objects (ie graphics bugs) > Anyway, If you encounter same problems you can uncomment this line: > //useSoft |= (0 != (Usage & D3DUSAGE_WRITEONLY)); > (dls/d3d8/vertexbuffer.c at line 71) __________________________________ Do you Yahoo!? Yahoo! Mail - You care about security. So do we. http://promotions.yahoo.com/new_mail

2 2

Internet Explorer 6 Installer script
by Hajime Segawa 26 Nov '04

26 Nov '04

I wrote a tiny shell script that can install IE6sp1 and WMP7. I hope this script can help you. RealPlayer 10, MSN Messenger 6.4, Yahoo!Japan Messenger seem to work with this configuration. http://sidenet.ddo.jp/winetips/config.html I took some screenshots. http://sidenet.ddo.jp/winetips/files/

2 2

dlls/mscms/profile.c breakage
by Gerald Pfeifer 25 Nov '04

25 Nov '04

The following change to dlls/mscms/profile.c revision 1.6 date: 2004/11/21 15:48:18; author: julliard; state: Exp; lines: +135 -3 Implement and test GetColorProfileElementTag, GetCountColorProfileElements and IsColorProfileTagPresent. Stub GetStandardColorSpaceProfile{A,W}. breaks FreeBSD 4.10 (with XFree86-4.3.0) as follows: gmake[2]: Entering directory `/.amd_mnt/nashira/files5/test/wine/dlls/mscms' /sw/gcc-3.3.4/bin/gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o profile.o profile.c profile.c: In function `GetColorProfileElementTag': profile.c:142: error: `LCMSICCPROFILE' undeclared (first use in this function) profile.c:142: error: (Each undeclared identifier is reported only once profile.c:142: error: for each function it appears in.) profile.c:142: error: `cmsprofile' undeclared (first use in this function) profile.c:142: error: parse error before ')' token profile.c: In function `GetCountColorProfileElements': profile.c:174: error: `LCMSICCPROFILE' undeclared (first use in this function) profile.c:174: error: `cmsprofile' undeclared (first use in this function) profile.c:174: error: parse error before ')' token gmake[2]: *** [profile.o] Error 1 gmake[2]: Leaving directory `/.amd_mnt/nashira/files5/test/wine/dlls/mscms' Gerald -- Gerald Pfeifer (Jerry) gerald(a)pfeifer.com http://www.pfeifer.com/gerald/

4 13

Major Winelib Problems
by Sam Lauber 25 Nov '04

25 Nov '04

I followed the tutorial for Winelib on my Linux system, building notepad. I examined the file "./notepad2" with readelf, and it said "Not an ELF file", and I do not have an a.out system. I opened it with my text editor (attached is the text I saw) and I was disappointed. Instead of a real "port", it was just a shell script that launches wine on a Windows program encapsulated in a ELF shared object file. I'm not happy. Samuel Lauber -- _____________________________________________________________ Web-based SMS services available at http://www.operamail.com. From your mailbox to local or overseas cell phones. Powered by Outblaze

5 5

Wineconf committee
by Jeremy White 25 Nov '04

25 Nov '04

Hey folks, Brian, Alexandre, and I have been talking with some kind folks that are volunteering to help host Wineconf in Stuttgart; we're thinking late spring for Stuttgart. We've also had a generous offer to help set up a meeting in conjunction with LinuxTag in Karlruhe in mid to late June. This is all great, but I realized suddenly that the three of us were starting to consider things and make decisions on behalf of the broader Wine community. While I enjoy exercising dictatorial impunity, I prefer to have a cover group to make my imperiousness less obvious <grin>. Seriously, I'd like to ask for volunteers to serve on a Wineconf planning committee. I think the requirements for the position are as follows: 1. Able and willing to attend the next Wineconf in Germany 2. Able and willing to engage in and follow the planning and decision making process 3. Have a credible background in the Wine community (or live in the right part of Germany <grin>). 4. Be willing to help in ways that may be required, such as showing up a day early to help prepare, or bringing A/V equipment, or whatever way makes sense. (This isn't a requirement, but I really would like folks that are at least willing to contribute a little extra, if they are able.) To volunteer, please email me privately, and I'll build a chain of emails. If we don't get any volunteers, then Brian, Alexandre, and I will consider ourselves empowered, and will dictate that Marcus does all the work <grin>. Cheers, Jeremy

2 2

Re: SetForegroundWindow() from WM_ACTIVATE broken
by Jon Griffiths 25 Nov '04

25 Nov '04

Hi, More on this problem ... here what happens under native when the back window is clicked: Order of trace below is (msg, hwnd, wparam,lparam) The app is started, click on the client area of the background window WM_MOUSEACTIVATE back 001203aa 02010001 (MA_ACTIVATE) Front window is told its going inactive WM_NCACTIVATE front 00000000 back WM_ACTIVATE front WA_INACTIVE back SetWindowPos() is called to raise back window to the front of the zorder, nc client and background told to paint WM_WINDOWPOSCHANGING back 00000000 0012fea8 WM_NCPAINT back 00000001 00000000 WM_ERASEBKGND back 0101005a 00000000 WM_WINDOWPOSCHANGED back 00000000 0012fea8 Back window is told its going active WM_NCACTIVATE back 00000001 front WM_ACTIVATE back WA_CLICKACTIVE front Now the back window calls SetForegroundWindow(front), within its WM_ACTIVATE handler Back window is told its going inactive WM_NCACTIVATE back 00000000 front WM_ACTIVATE back 00000000 front Front window brought to the top of the z-order w/SetWindowPos WM_WINDOWPOSCHANGING front 00000000 0012fd0c WM_NCPAINT front 00000001 00000000 WM_ERASEBKGND front 0101005a 00000000 WM_WINDOWPOSCHANGED front 00000000 0012fd0c Front window is told its going active WM_NCACTIVATE front 00000001 back WM_ACTIVATE front 00000001 back Under wine the message stream doesn't have the SetWindowPos calls, and there are several hundred activate/ncactivate messages, ending with the back window in the front of the z-order, activated with the focus. Looking at the logic in dlls/user/focus.c, in set_active_window(), it seems that SetWindowPos() was not being called because the windows both have the WS_EX_MANAGED style set. Commenting out the line if (!(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_MANAGED)) Caused the front window to remain on top after clicking on the back window, as desired. However it did then not get the focus as it should, and titlebar clicks and double clicks in the client area still allow the back window to rise to the top of the z-order. I added a test to check if the window is the foreground window (i.e. that some other window hasn't been set in the interim) before setting the focus. This means my test app now appears to work just like native. The attached patch makes both of these changes. I'd be interested in any comments regarding whether the above is correct. Cheers, Jon ===== "Don't wait for the seas to part, or messiahs to come; Don't you sit around and waste this chance..." - Live jon_p_griffiths(a)yahoo.com __________________________________ Do you Yahoo!? The all-new My Yahoo! - Get yours free! http://my.yahoo.com

1 0

Breakage on Debian Sarge
by Michael Jung 25 Nov '04

25 Nov '04

Hi, this patch (http://cvs.winehq.org/patch.py?id=14575) broke wine on a current Debian Sarge. Tested this on two machines. GUI applications do not respond any longer to mouse events. Tested regedit and winemine. Removing the patch solves the problem. Bye, Michael

3 2

Re: Adding debuginfo Support to Wine Makefiles
by Ivan Leo Puoti 25 Nov '04

25 Nov '04

> It is already there. I added support for it a few months ago. I've did debug packages for mdk the day after AJ commited your patch, but is there any easy way I can test to see if the debug info works with winedbg? Ivan. ____________________________________________________________ Libero ADSL: navighi gratis a 1.2 Mega, senza canone e costi di attivazione. Abbonati subito su http://www.libero.it

1 0

Re: Winecfg -> browse for folder
by Rolf Kalbermatter 24 Nov '04

24 Nov '04

Robert van Herk <robert(a)robertvanherk.nl> wrote: >Also, I am having some troubles into tricking the SHBrowseForFolder >thingy into using a different root folder, since I guess I need to use >SHParseDisplayName >(http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/pl…) >for that, but that doesn't seem to be implemented in Wine. This shouldn't be to difficult I guess. There are helper functions in shell32.pidl.c which should be close to what this function does actually. Something like this in pidl.c should do the trick: HRESULT WINAPI SHParseDisplayNameW(LPCWSTR pszName, IBindCtx *pbc, LPITEMIDLIST *ppidl, SFGAOF sfgaoIn, SFGAOF *psfgaoOut) { LPSHELLFOLDER sf; HRESULT ret = E_FAIL; TRACE("%s %p 0x%08lx\n", debugstr_w(pszName), ppidl, attributes ? *attributes : 0); if (SUCCEEDED (SHGetDesktopFolder(&sf))) { ret = IShellFolder_ParseDisplayName(sf, 0, pbc, (LPOLESTR)pszName, NULL, ppidl, &sfgaoIn); if (succeeded && psfgaoOut) *psfgaoOut = sfgaoIn; IShellFolder_Release(sf); } return ret; } Or you could probably use SHILCreateFromPathW() too for your purposes, which is similar. >Finally, I don't know how to free PIDLS. In the MSDN documentation they >use C++ calls for that, but I don't know how to port that to C. ILFree() exported as ordinal 155 from shell32 should be the function to use. It was undocumented in Windows for a long time but exists in shell32 since at least Win95. Rolf Kalbermatter

1 0

dinput - fix detection under Windows
by Steven Edwards 24 Nov '04

24 Nov '04

I am sending this to wine-devel as I would like a DirectInput hacker to comment on it. With this patch we are able to run some of the DirectX sample application using Wine dinput.dll on Windows. Changelog: Magnus Olsen <magnus(a)itkonsult-olsen.com> Add more polling of keyboard and mouse devices under DirectInput as Windows depends on this behavior. __________________________________ Do you Yahoo!? Yahoo! Mail - Helps protect you from nasty viruses. http://promotions.yahoo.com/new_mail

1 0

Stubs in PE build
by Ge van Geldorp 24 Nov '04

24 Nov '04

Stubs declared in .spec files were not generated or exported for PE (MinGW) builds. The patch below fixes that. It adds a new mode to winebuild, --pedll, which generates the stubs. Since it's a global change I'm sending it here for review first. Ge van Geldorp. Index: Make.rules.in =================================================================== RCS file: /home/wine/wine/Make.rules.in,v retrieving revision 1.179 diff -u -r1.179 Make.rules.in --- Make.rules.in 7 Oct 2004 03:12:44 -0000 1.179 +++ Make.rules.in 24 Nov 2004 20:49:51 -0000 @@ -104,7 +104,7 @@ api_manext = 3w conf_manext = 5 CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ - *.flc *.spec.c *.spec.def *.dbg.c *.tab.c *.tab.h @LEX_OUTPUT_ROOT@.c core + *.flc *.spec.c *.spec.def *.dbg.c *.pedll.c *.tab.c *.tab.h @LEX_OUTPUT_ROOT@.c core OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS) @@ -113,7 +113,7 @@ # Implicit rules -.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.c .spec.def .idl .h .ok .sfd .ttf +.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.c .spec.def .pedll.c .idl .h .ok .sfd .ttf .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -135,6 +135,9 @@ .spec.spec.def: $(WINEBUILD) -w $(DEFS) -o $@ --def $< + +.spec.pedll.c: + $(WINEBUILD) $(DEFS) -o $@ --pedll $< .idl.h: $(WIDL) $(IDLFLAGS) -h -H $@ $< Index: dlls/Makedll.rules.in =================================================================== RCS file: /home/wine/wine/dlls/Makedll.rules.in,v retrieving revision 1.69 diff -u -r1.69 Makedll.rules.in --- dlls/Makedll.rules.in 19 Oct 2004 23:06:12 -0000 1.69 +++ dlls/Makedll.rules.in 24 Nov 2004 20:49:53 -0000 @@ -31,8 +31,8 @@ # Rules for .dll files -$(MODULE): $(RCOBJS) $(OBJS) $(MODULE).dbg.o $(SPEC_DEF) $(IMPORTLIBS) Makefile.in - $(DLLWRAP) -k --def $(SPEC_DEF) -o $@ $(RCOBJS) $(OBJS) $(MODULE).dbg.o -L$(DLLDIR) $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS) +$(MODULE): $(RCOBJS) $(OBJS) $(MODULE).dbg.o $(MODULE:%.dll=%).pedll.o $(SPEC_DEF) $(IMPORTLIBS) $(DLLDIR)/libntdll.$(IMPLIBEXT) Makefile.in + $(DLLWRAP) -k --def $(SPEC_DEF) -o $@ $(RCOBJS) $(OBJS) $(MODULE).dbg.o $(MODULE:%.dll=%).pedll.o -L$(DLLDIR) $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) -lntdll $(ALL_LIBS) $(SPEC_DEF): $(WINEBUILD) Index: tools/winebuild/build.h =================================================================== RCS file: /home/wine/wine/tools/winebuild/build.h,v retrieving revision 1.54 diff -u -r1.54 build.h --- tools/winebuild/build.h 8 Oct 2004 21:11:18 -0000 1.54 +++ tools/winebuild/build.h 24 Nov 2004 20:50:34 -0000 @@ -185,6 +185,7 @@ extern void BuildSpec32File( FILE *outfile, DLLSPEC *spec ); extern void BuildDef32File( FILE *outfile, DLLSPEC *spec ); extern void BuildDebugFile( FILE *outfile, const char *srcdir, char **argv ); +extern void BuildPedllFile( FILE *outfile, DLLSPEC *spec ); extern int parse_spec_file( FILE *file, DLLSPEC *spec ); extern int parse_def_file( FILE *file, DLLSPEC *spec ); Index: tools/winebuild/main.c =================================================================== RCS file: /home/wine/wine/tools/winebuild/main.c,v retrieving revision 1.57 diff -u -r1.57 main.c --- tools/winebuild/main.c 19 Oct 2004 23:09:02 -0000 1.57 +++ tools/winebuild/main.c 24 Nov 2004 20:50:34 -0000 @@ -77,7 +77,8 @@ MODE_DEF, MODE_DEBUG, MODE_RELAY16, - MODE_RELAY32 + MODE_RELAY32, + MODE_PEDLL }; static enum exec_mode_values exec_mode = MODE_NONE; @@ -164,7 +165,8 @@ " --exe=NAME Build a .c file for the named executable\n" " --debug [FILES] Build a .c file with the debug channels declarations\n" " --relay16 Build the 16-bit relay assembly routines\n" -" --relay32 Build the 32-bit relay assembly routines\n\n" +" --relay32 Build the 32-bit relay assembly routines\n" +" --pedll Build a .c file for PE dll\n\n" "The mode options are mutually exclusive; you must specify one and only one.\n\n"; enum long_options_values @@ -178,7 +180,8 @@ LONG_OPT_RELAY16, LONG_OPT_RELAY32, LONG_OPT_SUBSYSTEM, - LONG_OPT_VERSION + LONG_OPT_VERSION, + LONG_OPT_PEDLL }; static const char short_options[] = "C:D:F:H:I:K:L:M:N:d:e:f:hi:kl:m:o:r:w"; @@ -195,6 +198,7 @@ { "relay32", 0, 0, LONG_OPT_RELAY32 }, { "subsystem",1, 0, LONG_OPT_SUBSYSTEM }, { "version", 0, 0, LONG_OPT_VERSION }, + { "pedll", 1, 0, LONG_OPT_PEDLL }, /* aliases for short options */ { "source-dir", 1, 0, 'C' }, { "delay-lib", 1, 0, 'd' }, @@ -356,6 +360,11 @@ case LONG_OPT_VERSION: printf( "winebuild version " PACKAGE_VERSION "\n" ); exit(0); + case LONG_OPT_PEDLL: + set_exec_mode( MODE_PEDLL ); + spec_file_name = xstrdup( optarg ); + set_dll_file_name( optarg, spec ); + break; case '?': usage(1); break; @@ -460,6 +469,11 @@ case MODE_RELAY32: if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); BuildRelays32( output_file ); + break; + case MODE_PEDLL: + if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); + if (!parse_input_file( spec )) break; + BuildPedllFile( output_file, spec ); break; default: usage(1); Index: tools/winebuild/spec32.c =================================================================== RCS file: /home/wine/wine/tools/winebuild/spec32.c,v retrieving revision 1.84 diff -u -r1.84 spec32.c --- tools/winebuild/spec32.c 18 Oct 2004 21:27:52 -0000 1.84 +++ tools/winebuild/spec32.c 24 Nov 2004 20:50:34 -0000 @@ -860,12 +860,10 @@ int is_data = 0; if (!odp) continue; - if (odp->flags & FLAG_REGISTER) continue; - if (odp->type == TYPE_STUB) continue; - if (odp->name) name = odp->name; + else if (odp->type == TYPE_STUB) name = make_internal_name( odp, spec, "stub" ); else if (odp->export_name) name = odp->export_name; - else continue; + else name = make_internal_name( odp, spec, "noname_export" ); fprintf(outfile, " %s", name); @@ -895,11 +893,37 @@ } break; } + case TYPE_STUB: + { + if (!kill_at) + { + const char *check = name + strlen(name); + while (name != check && + '0' <= check[-1] && check[-1] <= '9') + { + check--; + } + if (name != check && check != name + strlen(name) && + '@' == check[-1]) + { + fprintf(outfile, "%s", check - 1); + } + } + if (NULL != odp->name) + { + fprintf(outfile, "=%s", make_internal_name( odp, spec, "stub" )); + } + break; + } default: assert(0); } fprintf( outfile, " @%d", odp->ordinal ); +#if 0 /* MinGW binutils cannot handle this correctly */ if (!odp->name) fprintf( outfile, " NONAME" ); +#else + if (!odp->name && (odp->type == TYPE_STUB || odp->export_name)) fprintf( outfile, " NONAME" ); +#endif if (is_data) fprintf( outfile, " DATA" ); if (odp->flags & FLAG_PRIVATE) fprintf( outfile, " PRIVATE" ); fprintf( outfile, "\n" ); @@ -1005,4 +1029,25 @@ "}\n", prefix ); free( prefix ); +} + + +/******************************************************************* + * BuildPedllFile + * + * Build a PE DLL C file from a spec file. + */ +void BuildPedllFile( FILE *outfile, DLLSPEC *spec ) +{ + int nr_exports; + + nr_exports = spec->base <= spec->limit ? spec->limit - spec->base + 1 : 0; + output_standard_file_header( outfile ); + + if (nr_exports) + { + /* Output the stub functions */ + + output_stub_funcs( outfile, spec ); + } }

1 0

Clipping error
by Stefan Dösinger 24 Nov '04

24 Nov '04

Hello! I'm trying to run apple iTunes 4.7.0.42 in Winehq CVS and I'm getting this failure when I try to access the music store. Wine asks me to report this. err:local:LOCAL_GetBlock not enough space in GDI heap 10bf for 28 bytes err:region:CombineRgn Invalid rgn=(nil) err:local:LOCAL_GetBlock not enough space in GDI heap 10bf for 28 bytes err:clipping:CLIPPING_UpdateGCRegion hVisRgn is zero. Please report this. err:ntdll:RtlpWaitForCriticalSection section 0x407d7740 "gdiobj.c: GDI_level" wait timed out in thread 0070, blocked by 0075, retrying (60 sec) wine: Unhandled exception (thread 0070), starting debugger... Can't attach process 61: error 5 If it's interesting for you I can provide more infos, otherwise simply drop my mail. I'm just sending it because wine asks me to report this. The rest of iTunes seems to work somehow. The Gui opens and I can play music, but it's slow, with X eating 100% of my CPU time. I have to use a native setupapi.dll from WinXP. Stefan

2 1

read registry
by mammique 24 Nov '04

24 Nov '04

Hello, i'm looking for a lightweight way to read the windows regitry. I don't know windows, so i don't know how it's done. The goal in simply to check the windows network configuration of a machine from a live-cd, to use the same parameters on the running live-cd. Do i need wine api and dlls to do that, or is this the windows registry readable using lower-level way ? I would prefer not to use wine, then network detection could be done from ramdisk during boot. Wating for your ligths :-) Regards. Camille.

3 3

winecfg/drivedetect.c breaks portability (#include <mntent.h>)
by Gerald Pfeifer 24 Nov '04

24 Nov '04

The addition of winecfg/drivedetect.c via revision 1.1 date: 2004/11/23 13:50:23; author: julliard; state: Exp; Mike Hearn <mike(a)navi.cx> - More heapification. - Split drive code into core, UI and autodetect. - Implement drive autodetection. - Slight redesign of drive tab. - Code cleanup. broke FreeBSD 4.10 which does not have <mntent.h>: /sw/gcc-3.3.4/bin/gcc -c -I. -I. -I../../include -I../../include -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o drivedetect.o drivedetect.c drivedetect.c:28:20: mntent.h: No such file or directory In fact, FreeBSD 4.10 does not have getmntent() at all which leads to further breakage even if you properly autoconf for <mntent.h>: drivedetect.c:206: warning: implicit declaration of function `getmntent' The Linux man page states SysV also has a getmntent() function but the calling sequence differs, and the returned structure is different. Under SysV /etc/mnttab is used. BSD 4.4 and Digital Unix have a routine getmntinfo(), a wrapper around the system call getfsstat(). http://www.gsp.com/cgi-bin/man.cgi?section=3&topic=getmntinfo has the man page for FreeBSD. Gerald -- Gerald Pfeifer (Jerry) gerald(a)pfeifer.com http://www.pfeifer.com/gerald/

1 1

Problem roundup
by Mike Hearn 24 Nov '04

24 Nov '04

Hi, So, trolling linuxquestions.org reveals the following top 3 problems users are having with Wine currently: 1) The RH9 RPMs are apparently being compiled with epoll support linked in. This is causing user pain. We should really be using dlsym here, why are we not again? 2) Our bestest bestest friends over at InstallShield Corp have released a new version of their elegant and simple product, which refuses to start with builtin DCOM. 3) Some people still seem to be getting the "C:\\Windows\\System does not exist" message. thanks -mike

6 21

Packaging Questions, New Debian Package, Packagers Guide
by Scott Ritchie 24 Nov '04

24 Nov '04

The Debian packages have gotten rather out of date, and it looks like Ove's not going to be making them any more. I took the initiative and decided to try making one myself. I'm polishing off a new Debian package now. Some major things I noticed: 1) There were a lot of old hacks in the package that are probably no longer necessary, due to advancements in wine like wineprefixcreate and such. There was also the remenants of a very old problem with compiling using flex (which I remember experiencing the old days) in the form of a special exception for installing newer flex packages. 2) Very old packages like winesetuptk should now be officially obsoleted by making them conflicted and replaced. I also did the same to the libwine-* packages that weren't doing anything but making documentation folders, like libwine-alsa. 3) Making my package looks to be a lot simpler than what's implied in the (now year out of date) package makers guide. I found that documentation quite useless (and didn't even find it until I was about half way done anyway). Again, this is probably due to advancements in wine itself. 4) What I didn't find is a standard list of packages that aren't strictly required for wine (like libxt-dev and flex), but that wine can benefit from. A good example would be the alsa development files. These are all things that should be included in the build dependencies for the package. So far, my list of build dependant packages is the following: flex, bison, libx11-dev, libasound2-dev, libxt-dev, libicu28-dev However, I'm not sure if this means the wine binary package should depend on them, since it's compiled in. So, should I make libicu28 a dependancy for wine? Now, this leads to the question: is it worth even having a package maintainers guide? If so, who wants to update it? Thanks, Scott Ritchie

8 20

Fwd: Re: [Wine]DC++ crashes with current CVS wine
by Pavel Troller 24 Nov '04

24 Nov '04

Hi! I've sent the message below to wine-users mailing list and nobody has replied until now. So I subscribed do wine-devel and I'm posting the message here. Of course I cannot distinguish whether this problem is important enough to be fixed, but I think it's some problem with wine dlls so it can help other apps too.. With regards, Pavel Troller ----- Forwarded message from Pavel Troller <patrol(a)sinus.cz> ----- > Hi! > I have a problem, that DC++ client now crashes in wine. The problem is that it > crashes using its own exception handler, from the wine's point of view the app > is running OK. The client simply pops up a dialog box saying that it just > crashed and the debug info is placed in a file called exceptioninfo.txt. OK, the > file is really there and it really shows something important: > > Code: c0000005 > Version: 0.4034 > Major: 4 > Minor: 10 > Build: 67766446 > SP: 0 > Type: 0 > Time: 2004-11-21 08:09:57 > TTH: EJEUEI5NYOW2OQOXRJC7OHZ2ZUSLA5JF6IPD6TI > > c:\documents\vcprojects\dcplusplus\windows\transferview.cpp(195): ? > c:\documents\vcprojects\dcplusplus\windows\transferview.h(50): ? > c:\program files\vs.net 2003\vc7\atlmfc\include\atlwin.h(3017): ? > user32!0x666BABF7: ? > user32!0x666BAF39: ? > user32!0x666C0D29: ? > user32!0x666ED284: ? > user32!0x666EE099: ? > user32!0x666EE2D5: ? > comctl32!0x57758097: ? > comctl32!0x5775D2C5: ? > comctl32!0x5775DFAE: ? > comctl32!0x5775E518: ? > comctl32!0x577666D7: ? > comctl32!0x577675C7: ? > user32!0x666BABF7: ? > user32!0x666BAF39: ? > user32!0x666C0D29: ? > c:\program files\vs.net 2003\vc7\atlmfc\include\atlwin.h(3020): ? > user32!0x666BABF7: ? > user32!0x666BAF39: ? > user32!0x666C0D29: ? > user32!0x666A3996: ? > c:\documents\vcprojects\include\wtl-7.5.4196\atlapp.h(499): ? > c:\documents\vcprojects\dcplusplus\windows\main.cpp(270): ? > 0x1F83D6C8: ? > > Because user32 and comctl32 are both mentioned in the backtrace, I tried to > switch them to native, but the program then crashed in a much worse way, > ending at a wine-dbg> prompt. > This exception info is shown, when win98 is emulated. Normally I'm emulating > nt40, in which case the backtrace is missing but the crash is looking very > similar from the user's point of view. > No important information (like unimplemented call etc.) is shown in the > wine's stdout/stderr. > Is there a developer which can help with this problem ? > With regards, Pavel Troller Hi! I have a lot of news in this case: I've downloaded sources for DC++ unstable and looked onto them to see in which place the program crashes. I've found that it occurs when the download/upload progress bar is about to be drawn. I've also found that progress bar drawing can be disabled in advanced setting (oh yes, source is the best user's manual You can have :-) ). I did so and DC++ started to work for me. I think that it is a good starting point for a wine developer to find, what's happening there, it should be easy to find when the source code which exhibits the bug is available and exact location of bug invocation is known. Because I know windows at a zero level, I cannot help with this, but I hope that others can, and fixing this bug may help other apps too (and, even in DC++, the bars are a nice eye-candy :-) ). Should I post this message to wine-devel, or is it enough to post it here, in wine-users ? With regards, Pavel Troller ----- End forwarded message -----

1 0

Re: Implement OleDuplicateData
by Dmitry Timoshkov 24 Nov '04

24 Nov '04

"Robert Shearman" <rob(a)codeweavers.com> wrote: > + logpalette->palVersion = 1; /* FIXME: what should this be? */ All Microsoft and other samples I've seen initialize this filed to 0x300. -- Dmitry.

1 0

Re: Problem roundup
by Ivan Leo Puoti 23 Nov '04

23 Nov '04

> So perhaps it would be better to build the RPMs against "pure" installs of > each distro, from the CDs? As i think nobody wants buggy systems, this will mean using --force to install RPMs of old headers. I've never heard of such an update breaking my RPMs so I won't do any such thing without considerable proof that it is really necessary and there is no better option. Ivan. ____________________________________________________________ Libero ADSL: navighi gratis a 1.2 Mega, senza canone e costi di attivazione. Abbonati subito su http://www.libero.it

1 0

Re: Version Resources
by Dan Kegel 23 Nov '04

23 Nov '04

Tom wrote: > I hope this patch looks better. :) > If anything is incorrect just let me know. FYI, please don't use # in patch filenames. Sometimes that's a comment character, and it gives us shell programmers the willies. - Dan -- Trying to get a job as a c++ developer? See http://kegel.com/academy/getting-hired.html

2 1

System colors
by Kevin Koltzau 23 Nov '04

23 Nov '04

CreateBrushIndirect under Wine currently returns stock brushes if the brush requested matches the color. In gdi/brush.c the following comment is made: /* If a solid brush is created in a color matching one of the * stock brushes, native returns the stock object (GDI heap * optimisation). Some apps rely on this as they otherwise * would leak their brushes. */ However under both Windows 95 and Windows XP this does not seem to be the case. Under Windows, the following holds true, but fails under Wine GetStockObject(BLACK_BRUSH) != CreateSolidBrush(RGB(0,0,0)) This issue currently breaks applications making calls to SetSysColors as stock brushes are deleted as the new colors are added. Does anyone know why this was setup in this way? Or which version of Windows that exhibits the behavior mentioned in the comment? -Kevin

2 1

Problems with mailing list
by Robert van Herk 23 Nov '04

23 Nov '04

Hi all, Last month I moved, as did my ip address. Since then, I don't seem to get any messages from the wine devel mailing list, although I am still subscribed. I don't know whom to send this to, but can somebody (the admin of the list) please try to find out what is the problem? Thanx, Robert

2 1

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