December 2003 - Wine-Devel - list.winehq.org

Re: Congradulations - windef.h

by Dimitrie O. Paun

On December 31, 2003 04:38 am, Boaz Harrosh wrote: > they were/are protected, but I think it should be removed from winegcc > because they don't do the Job. Maybe, I'm not sure. I'll let Alexandre comment on the ms-extensions.h idea. In general, he does not like non-standard headers... > Please don't do: # define __declspec(x) __ONLY_IN_WINELIB(__declspec_##x) > it will break things. See if my fix is good enough if not we can do an > #else What you have now is OK me thinks. > <patch> > > ? windef.diff > ? wine.kdevelop Are you using KDevelop to work on Wine? Is it OK? I'm a vim guy myself, and I've never used KDevelop, but I could maybe use some autocompletion :) -- Dimi.

Dec. 31, 2003

Re: Simple arguments check

by Mike Hearn

On Tue, 2003-12-30 at 22:29, Alexandre Julliard wrote: > The ERRs are useless. If Windows does a NULL check, then we should do > one too, without any error message; if Windows doesn't, then we > shouldn't check at all. Well, I tested with a 98 copy of shell32 and it crashes too, so I guess the patch was wrong anyway. I can't seem to reproduce the original problem I was trying to solve anyway, so oh well, mark it for the X files. I guess the reason we need to crash when windows does is for apps that trap the fault and rely on it? Or is it just about being as correct as possible?

Dec. 31, 2003

RE: unknwn.h: unknwn.idl

by Robert Shearman

> -----Original Message----- > From: wine-devel-admin(a)winehq.org [mailto:wine-devel-admin(a)winehq.org]On > Behalf Of Boaz Harrosh > Sent: 31 December 2003 14:56 > To: wine-devel mailing list > Subject: unknwn.h: unknwn.idl > > 2 Questions > > 1) if I do "make depend" than edit unknwn.idl (or any other idl) than do > "make" should a new unknwn.h be compiled? > Well it does not. If I "cd include" and "make" than nothing is done > either. only if I do "make unknwn.h" it will compile. "make idl" will make all of the idl files. I'm not sure why it is done this way, but those files are only updated once in a blue moon anyway. > > 2) In order for ATL to compile I need below code in my unknwn.h file. I > could not fined a way to do it with WIDL. Use cpp_quote (grep for examples in other idl files). > I have looked in Microsoft (vc6) header/idl and it looks they had the > same problem. And below code was added by hand. > Now if the answer to Q1 is "No not done automatically" than I guess I > can submit a patch for unknwn.h only. could I also submit a patch to > include/Makefile.in to remove unknwn.idl from the list of idl files so > it will not accidentally over-write unknwn.h? No. You should use cpp_quote. It may be necessary to disable stuff in the .h generated file which you can do with: cpp_quote("#if 0") ... cpp_quote("#endif") > I have tried below simple idl code but it will go to all the wrong places Where does it go? Maybe you need to also protect that bit of code with #if defined _cplusplus? > <bad unknwn.idl code> > ... > > interface IUnknown > { > typedef [unique] IUnknown *LPUNKNOWN; > > HRESULT QueryInterface( > [in] REFIID riid, > [out, iid_is(riid)] void **ppvObject); > ULONG AddRef(); > ULONG Release(); > cpp_quote("#if !defined(WINE_NO_UUIDOF)") > cpp_quote("template <class Q>") > cpp_quote("HRESULT STDMETHODCALLTYPE QueryInterface(Q** pp)") > cpp_quote("{") > cpp_quote(" return QueryInterface(__uuidof(Q), (void**)pp);") > cpp_quote("}") > cpp_quote("#endif") > > } > > cpp_quote("#if !defined(WINE_NO_UUIDOF)") > cpp_quote("} /*extern C++*/") > cpp_quote("#endif") > > ... > </bad unknwn.idl code>

Dec. 31, 2003

New registry key adding patch

by Zimler Attila

Hi, I made the regedit program able to add new registry key (however, the key does not appear until next run of regedit in the browser tree - as I consulted it with Dimitrie, it will be handled later). The diff is made against todays cvs tree (as 2003 december 31). Attila PS: Dimitrie: what is the next step to do? diff -r -d -c -N wine/programs/regedit/edit.c wine.new_regkey/programs/regedit/edit.c *** wine/programs/regedit/edit.c 2003-12-12 04:08:59.000000000 +0000 --- wine.new_regkey/programs/regedit/edit.c 2003-12-31 14:36:44.000000000 +0000 *************** *** 17,22 **** --- 17,25 ---- * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + /* Modified by Attila ZIMLER <hijaszu(a)hlfslinux.hu> on 28th of dec 2003. + - New key adding is now supported. + */ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ *************** *** 91,96 **** --- 94,129 ---- return FALSE; } + BOOL CreateKey(HKEY hKey) + { + LONG lRet; + HKEY retKey; + char* keyName = 0; + unsigned int keyNum = 1; + + /* If we have illegal parameter return with operation failure */ + if (!hKey) return FALSE; + + /* try to find out a name for the newly create key */ + /* TODO: warning is issued because asprintf's implicit declaration, + I tried to declare it as + extern "C" ssize_t asprintf(char**, const char**, ...) + which is the format of this function, but it seems not helping. + Don't know why :( + */ + asprintf(&keyName, "new key"); + lRet = RegOpenKey(hKey, keyName, &retKey); + while (lRet == ERROR_SUCCESS) { + asprintf(&keyName, "new key %u", ++keyNum); + lRet = RegOpenKey(hKey, keyName, &retKey); + } + + lRet = RegCreateKey(hKey, keyName, &retKey); + + free(keyName); + return lRet == ERROR_SUCCESS; + } + BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName) { DWORD valueDataLen; diff -r -d -c -N wine/programs/regedit/framewnd.c wine.new_regkey/programs/regedit/framewnd.c *** wine/programs/regedit/framewnd.c 2003-12-12 04:08:59.000000000 +0000 --- wine.new_regkey/programs/regedit/framewnd.c 2003-12-31 14:38:34.000000000 +0000 *************** *** 469,474 **** --- 469,478 ---- case ID_EDIT_COPYKEYNAME: CopyKeyName(hWnd, _T("")); break; + case ID_EDIT_NEW_KEY: + if (CreateKey(hKey)) + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); + break; case ID_REGISTRY_PRINTERSETUP: /*PRINTDLG pd;*/ /*PrintDlg(&pd);*/ diff -r -d -c -N wine/programs/regedit/main.h wine.new_regkey/programs/regedit/main.h *** wine/programs/regedit/main.h 2003-12-12 04:08:59.000000000 +0000 --- wine.new_regkey/programs/regedit/main.h 2003-12-31 14:39:57.000000000 +0000 *************** *** 93,98 **** --- 93,99 ---- extern LPCTSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); /* edit.c */ + BOOL CreateKey(HKEY hKey); BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName); #endif /* __MAIN_H__ */

Dec. 31, 2003

Re: PATCH: dlls/winmm/wineoss/audio.c

by Gerald Pfeifer

On Tue, 30 Dec 2003, Alexandre Julliard wrote: >> I'm not sure whether you want to make this change in general, for all >> platforms, so for now I have embedded it in an #if(n)def. > I think we should do that on all platforms, yes. And you probably want > to fix OSS_WaveInInit too. Good catch! As promised, please find an updated patch below. Gerald ChangeLog: Improve error messages in OSS_WaveOutInit() and OSS_WaveInInit() and warn instead of aborting in case of problems reading mixer info. This makes sound work on FreeBSD. Index: audio.c =================================================================== RCS file: /home/wine/wine/dlls/winmm/wineoss/audio.c,v retrieving revision 1.108 diff -u -3 -p -r1.108 audio.c --- audio.c 12 Dec 2003 05:55:26 -0000 1.108 +++ audio.c 31 Dec 2003 15:52:05 -0000 @@ -538,17 +538,18 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* if ((mixer = open(ossdev->mixer_name, O_RDONLY|O_NDELAY)) >= 0) { mixer_info info; if (ioctl(mixer, SOUND_MIXER_INFO, &info) >= 0) { - close(mixer); strncpy(ossdev->ds_desc.szDesc, info.name, sizeof(info.name)); strcpy(ossdev->ds_desc.szDrvName, "wineoss.drv"); strncpy(ossdev->out_caps.szPname, info.name, sizeof(info.name)); TRACE("%s\n", ossdev->ds_desc.szDesc); } else { - ERR("%s: can't read info!\n", ossdev->mixer_name); - OSS_CloseDevice(ossdev); - close(mixer); - return FALSE; + /* FreeBSD up to at least 5.2 provides this ioctl, but does not + * implement it properly, and there are probably similar issues + * on other platforms, so we warn but try to go ahead. + */ + WARN("%s: cannot read SOUND_MIXER_INFO!\n", ossdev->mixer_name); } + close(mixer); } else { ERR("%s: %s\n", ossdev->mixer_name , strerror( errno )); OSS_CloseDevice(ossdev); @@ -680,15 +681,16 @@ static BOOL OSS_WaveInInit(OSS_DEVICE* o if ((mixer = open(ossdev->mixer_name, O_RDONLY|O_NDELAY)) >= 0) { mixer_info info; if (ioctl(mixer, SOUND_MIXER_INFO, &info) >= 0) { - close(mixer); strncpy(ossdev->in_caps.szPname, info.name, sizeof(info.name)); TRACE("%s\n", ossdev->ds_desc.szDesc); } else { - ERR("%s: can't read info!\n", ossdev->mixer_name); - OSS_CloseDevice(ossdev); - close(mixer); - return FALSE; + /* FreeBSD up to at least 5.2 provides this ioctl, but does not + * implement it properly, and there are probably similar issues + * on other platforms, so we warn but try to go ahead. + */ + WARN("%s: cannot read SOUND_MIXER_INFO!\n", ossdev->mixer_name); } + close(mixer); } else { ERR("%s: %s\n", ossdev->mixer_name, strerror(errno)); OSS_CloseDevice(ossdev);

Dec. 31, 2003

unknwn.h: unknwn.idl

by Boaz Harrosh

2 Questions 1) if I do "make depend" than edit unknwn.idl (or any other idl) than do "make" should a new unknwn.h be compiled? Well it does not. If I "cd include" and "make" than nothing is done either. only if I do "make unknwn.h" it will compile. 2) In order for ATL to compile I need below code in my unknwn.h file. I could not fined a way to do it with WIDL. I have looked in Microsoft (vc6) header/idl and it looks they had the same problem. And below code was added by hand. Now if the answer to Q1 is "No not done automatically" than I guess I can submit a patch for unknwn.h only. could I also submit a patch to include/Makefile.in to remove unknwn.idl from the list of idl files so it will not accidentally over-write unknwn.h? <unknwn.h snippet> ... DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); #if defined(__cplusplus) && !defined(CINTERFACE) #if !defined(WINE_NO_UUIDOF) #include <wine/uuidof.h> extern "C++" { #endif #ifdef ICOM_USE_COM_INTERFACE_ATTRIBUTE struct __attribute__((com_interface)) IUnknown #else struct IUnknown #endif { virtual HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, void** ppvObject) = 0; virtual ULONG STDMETHODCALLTYPE AddRef( ) = 0; virtual ULONG STDMETHODCALLTYPE Release( ) = 0; #if !defined(WINE_NO_UUIDOF) template <class Q> HRESULT STDMETHODCALLTYPE QueryInterface(Q** pp) { return QueryInterface(__uuidof(Q), (void**)pp); } #endif }; #if !defined(WINE_NO_UUIDOF) } // extern "C++" #endif #else ... </unknwn.h snippet> I have tried below simple idl code but it will go to all the wrong places <bad unknwn.idl code> ... interface IUnknown { typedef [unique] IUnknown *LPUNKNOWN; HRESULT QueryInterface( [in] REFIID riid, [out, iid_is(riid)] void **ppvObject); ULONG AddRef(); ULONG Release(); cpp_quote("#if !defined(WINE_NO_UUIDOF)") cpp_quote("template <class Q>") cpp_quote("HRESULT STDMETHODCALLTYPE QueryInterface(Q** pp)") cpp_quote("{") cpp_quote(" return QueryInterface(__uuidof(Q), (void**)pp);") cpp_quote("}") cpp_quote("#endif") } cpp_quote("#if !defined(WINE_NO_UUIDOF)") cpp_quote("} /*extern C++*/") cpp_quote("#endif") ... </bad unknwn.idl code>

Dec. 31, 2003

Renaming registry keys...

by Robert van Herk

Hi! Does anybody have a C algorithm to rename a registry section using the Win32 API? I need such a thing for winecfg, but Win32 doesn't seem to have a RegKeyRename api-call... Grtz, Robert

Dec. 31, 2003

Re: MCI #4: Add support for many MCIWNDM_ messages and some MCI_ commands

by Dmitry Timoshkov

"Tom" <twickline(a)skybest.com> wrote: > Okay, its tommorow a list please........ The list is in the source, have a look. Moreover it's 31 Dec evening here, and everything suggests to get a rest and do some preparations for the celebration... With coming Happy New Year everyone! -- Dmitry.

Dec. 31, 2003

Re: Congradulations - windef.h

by Boaz Harrosh

Dimitrie O. Paun wrote: >Please embed if you can, it makes it so much easier to >comment on the code. > > And let the mozzila spell-check code comments :) >A few comments: > -- please don't use C++ comments (//...), > use C comments instead (/* ... */) > > Done > -- these things are defined by winegcc as well, we should > protect them with #ifndef, otherwise we'll get a lot of > warnings when building with winegcc > > they were/are protected, but I think it should be removed from winegcc because they don't do the Job. If you accept my proposal of ms-extensions.h collecting all these, and cleaning up wine headers, than winegcc could do: "-include ms-extensions.h" to take care of all extensions in one command line switch. (It can also give people using winegcc the freedom of what is defined). What is your opinion of an ms-extensions.h file? you didn't say. > -- these things should not be available while building Wine, > we should use the __ONLY_IN_WINELIB() like so: > # define __declspec(x) __ONLY_IN_WINELIB(__declspec_##x) > > > Please don't do: # define __declspec(x) __ONLY_IN_WINELIB(__declspec_##x) it will break things. See if my fix is good enough if not we can do an #else <patch> ? windef.diff ? wine.kdevelop Index: include/windef.h =================================================================== RCS file: /home/wine/wine/include/windef.h,v retrieving revision 1.89 diff -u -r1.89 windef.h --- include/windef.h 24 Sep 2003 05:26:00 -0000 1.89 +++ include/windef.h 31 Dec 2003 09:15:15 -0000 @@ -113,14 +113,44 @@ #define FAR __ONLY_IN_WINELIB() #endif + #ifndef _MSC_VER -# ifndef _declspec -# define _declspec(x) __ONLY_IN_WINELIB() + +/* works well. Some times the exact placing varies with in the statement */ +#define __declspec_selectany __attribute__((weak)) +/* ignored by GCC and is warned (supported by MinGW) */ +#define __declspec_dllexport __attribute__((dllexport)) +/* ignored by GCC and is warned (supported by MinGW) */ +#define __declspec_dllimport __attribute__((dllimport)) +/* works */ +#define __declspec_noreturn __attribute__ ((noreturn)) +/* works */ +#define __declspec_nothrow __attribute__ ((nothrow)) +/* works ?? */ +#define __declspec_naked __attribute__ ((naked)) + +/* GCC is more restrictive about placing. look for TLS in gcc & msdn documentation */ +#define __declspec_thread __thread +/* no parallel defined to nothing */ +#define __declspec_novtable +/* Gcc only supports code ?? */ +#define __declspec_allocate(segname) __attribute__ (( section(segname) )) + +/* property is supported through the file pretty_com.h */ +/* property( get=get_func_name|, put=put_func_name ) */ + +/* _declspec( uuid() ) and __uuidof are supported with code changes */ +/* see uuidof.h */ +#define __declspec_uuid(ComObjectGUID) error_SEE__uuidof_h__for_use_of_uuid + +# if !defined(_declspec) && !defined (__WINESRC__) +# define _declspec(x) __declspec_##x # endif -# ifndef __declspec -# define __declspec(x) __ONLY_IN_WINELIB() +# if !defined(_declspec) && !defined (__WINESRC__) +# define __declspec(x) __declspec_##x # endif -#endif + +#endif //_MSC_VER #define CALLBACK __stdcall #define WINAPI __stdcall </patch> Free Life Boaz

Dec. 31, 2003

Re: Congradulations - windef.h

by Dimitrie O. Paun

On December 31, 2003 03:33 am, Boaz Harrosh wrote: > Thanks > OK lets start with an oldy Just to see if I get the tools right: > > <patch> > see attachment > </patch> > > should I embed or attach? Please embed if you can, it makes it so much easier to comment on the code. A few comments: -- please don't use C++ comments (//...), use C comments instead (/* ... */) -- these things are defined by winegcc as well, we should protect them with #ifndef, otherwise we'll get a lot of warnings when building with winegcc -- these things should not be available while building Wine, we should use the __ONLY_IN_WINELIB() like so: # define __declspec(x) __ONLY_IN_WINELIB(__declspec_##x) -- Dimi.

Dec. 31, 2003