wine-devel

wine-devel@winehq.org

8 participants
84486 discussions

Start a nNew thread

Re: Listview N5
by Dimitrie O. Paun 13 Oct '02

13 Oct '02

If you haven't checked in N5, please ignore it. I'll resubmit it when I move all of the custom draw around. -- Dimi.

2 2

Re: 16 shell seperation
by Michael Stefaniuc 12 Oct '02

12 Oct '02

You forgot to do the right HKEY <--> HKEY16 conversions with HKEY_16() and HKEY_32(), examples how to do it should be in the code. bye michael On Sat, Oct 12, 2002 at 05:20:31PM -0000, György 'Nog' Jeney wrote: > Is it possible to move all of the resources in the shell32 directory to a > sub directory inside shell32 like resources (just like gdi)? Its quite > confusing the way it is now. > > Changelog: > * dlls/shell32/shell32_main.h > * dlls/shell32/shell.c > * dlls/shell32/shellreg.c > * dlls/shell32/Makefile.in > * dlls/shell32/shlexec.c > Seperate out 16-bit funvtions into seperate file. > > nog. > > Index: dlls/shell32/shell.c > =================================================================== > RCS file: /home/wine/wine/dlls/shell32/shell.c,v > retrieving revision 1.46 > diff -u -r1.46 shell.c > --- dlls/shell32/shell.c 10 Oct 2002 21:22:11 -0000 1.46 > +++ dlls/shell32/shell.c 12 Oct 2002 17:07:39 -0000 > @@ -2,6 +2,7 @@ > * Shell Library Functions > * > * Copyright 1998 Marcus Meissner > + * Copyright 2000 Juergen Schmied > * Copyright 2002 Eric Pouech > * > * This library is free software; you can redistribute it and/or > @@ -526,4 +527,115 @@ > break; > } > return ret; > +} > + > + > +/* 0 and 1 are valid rootkeys in win16 shell.dll and are used by > + * some programs. Do not remove those cases. -MM > + */ > +static inline void fix_win16_hkey( HKEY *hkey ) > +{ > + if (*hkey == 0 || *hkey == (HKEY)1) *hkey = HKEY_CLASSES_ROOT; > +} > + > +/****************************************************************************** > + * RegOpenKey [SHELL.1] > + */ > +DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, PHKEY retkey ) > +{ > + fix_win16_hkey( &hkey ); > + return RegOpenKeyA( hkey, name, retkey ); > +} > + > +/****************************************************************************** > + * RegCreateKey [SHELL.2] > + */ > +DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR name, PHKEY retkey ) > +{ > + fix_win16_hkey( &hkey ); > + return RegCreateKeyA( hkey, name, retkey ); > +} > + > +/****************************************************************************** > + * RegCloseKey [SHELL.3] > + */ > +DWORD WINAPI RegCloseKey16( HKEY hkey ) > +{ > + fix_win16_hkey( &hkey ); > + return RegCloseKey( hkey ); > +} > + > +/****************************************************************************** > + * RegDeleteKey [SHELL.4] > + */ > +DWORD WINAPI RegDeleteKey16( HKEY hkey, LPCSTR name ) > +{ > + fix_win16_hkey( &hkey ); > + return RegDeleteKeyA( hkey, name ); > +} > + > +/****************************************************************************** > + * RegSetValue [SHELL.5] > + */ > +DWORD WINAPI RegSetValue16( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWORD count ) > +{ > + fix_win16_hkey( &hkey ); > + return RegSetValueA( hkey, name, type, data, count ); > +} > + > +/****************************************************************************** > + * RegQueryValue [SHELL.6] > + * > + * NOTES > + * Is this HACK still applicable? > + * > + * HACK > + * The 16bit RegQueryValue doesn't handle selectorblocks anyway, so we just > + * mask out the high 16 bit. This (not so much incidently) hopefully fixes > + * Aldus FH4) > + */ > +DWORD WINAPI RegQueryValue16( HKEY hkey, LPCSTR name, LPSTR data, LPDWORD count > +) > +{ > + fix_win16_hkey( &hkey ); > + if (count) *count &= 0xffff; > + return RegQueryValueA( hkey, name, data, count ); > +} > + > +/****************************************************************************** > + * RegEnumKey [SHELL.7] > + */ > +DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len ) > +{ > + fix_win16_hkey( &hkey ); > + return RegEnumKeyA( hkey, index, name, name_len ); > +} > + > + > +/************************************************************************* > + * ShellExecute [SHELL.20] > + */ > +HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation, > + LPCSTR lpFile, LPCSTR lpParameters, > + LPCSTR lpDirectory, INT16 iShowCmd ) > +{ > + SHELLEXECUTEINFOA sei; > + HANDLE hProcess = 0; > + > + sei.cbSize = sizeof(sei); > + sei.fMask = 0; > + sei.hwnd = HWND_32(hWnd); > + sei.lpVerb = lpOperation; > + sei.lpFile = lpFile; > + sei.lpParameters = lpParameters; > + sei.lpDirectory = lpDirectory; > + sei.nShow = iShowCmd; > + sei.lpIDList = 0; > + sei.lpClass = 0; > + sei.hkeyClass = 0; > + sei.dwHotKey = 0; > + sei.hProcess = hProcess; > + > + ShellExecuteExA32 (&sei, FALSE); > + return (HINSTANCE16)sei.hInstApp; > } > Index: dlls/shell32/Makefile.in > =================================================================== > RCS file: /home/wine/wine/dlls/shell32/Makefile.in,v > retrieving revision 1.53 > diff -u -r1.53 Makefile.in > --- dlls/shell32/Makefile.in 27 Aug 2002 01:34:34 -0000 1.53 > +++ dlls/shell32/Makefile.in 12 Oct 2002 17:07:42 -0000 > @@ -27,7 +27,6 @@ > iconcache.c \ > memorystream.c \ > pidl.c \ > - shell.c \ > shell32_main.c \ > shelllink.c \ > shellole.c \ > @@ -50,6 +49,7 @@ > > RC_SRCS= shres.rc > RC_SRCS16 = version16.rc > +C_SRCS16 = shell.c > > SUBDIRS = tests > > Index: dlls/shell32/shell32_main.h > =================================================================== > RCS file: /home/wine/wine/dlls/shell32/shell32_main.h,v > retrieving revision 1.53 > diff -u -r1.53 shell32_main.h > --- dlls/shell32/shell32_main.h 10 Oct 2002 21:22:11 -0000 1.53 > +++ dlls/shell32/shell32_main.h 12 Oct 2002 17:07:48 -0000 > @@ -202,4 +202,7 @@ > #define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) > #define HWND_32(h16) ((HWND)(ULONG_PTR)(h16)) > > +/* needed by 16-bit shell code in shell.c */ > +BOOL WINAPI ShellExecuteExA32 (LPSHELLEXECUTEINFOA sei, BOOL is32); > + > #endif > Index: dlls/shell32/shellreg.c > =================================================================== > RCS file: /home/wine/wine/dlls/shell32/shellreg.c,v > retrieving revision 1.14 > diff -u -r1.14 shellreg.c > --- dlls/shell32/shellreg.c 3 Oct 2002 19:46:27 -0000 1.14 > +++ dlls/shell32/shellreg.c 12 Oct 2002 17:07:52 -0000 > @@ -147,86 +147,3 @@ > TRACE("0x%04x\n",hkey); > return RegCloseKey( hkey ); > } > - > - > -/* 16-bit functions */ > - > -/* 0 and 1 are valid rootkeys in win16 shell.dll and are used by > - * some programs. Do not remove those cases. -MM > - */ > -static inline void fix_win16_hkey( HKEY *hkey ) > -{ > - if (*hkey == 0 || *hkey == (HKEY)1) *hkey = HKEY_CLASSES_ROOT; > -} > - > -/****************************************************************************** > - * RegOpenKey [SHELL.1] > - */ > -DWORD WINAPI RegOpenKey16( HKEY hkey, LPCSTR name, PHKEY retkey ) > -{ > - fix_win16_hkey( &hkey ); > - return RegOpenKeyA( hkey, name, retkey ); > -} > - > -/****************************************************************************** > - * RegCreateKey [SHELL.2] > - */ > -DWORD WINAPI RegCreateKey16( HKEY hkey, LPCSTR name, PHKEY retkey ) > -{ > - fix_win16_hkey( &hkey ); > - return RegCreateKeyA( hkey, name, retkey ); > -} > - > -/****************************************************************************** > - * RegCloseKey [SHELL.3] > - */ > -DWORD WINAPI RegCloseKey16( HKEY hkey ) > -{ > - fix_win16_hkey( &hkey ); > - return RegCloseKey( hkey ); > -} > - > -/****************************************************************************** > - * RegDeleteKey [SHELL.4] > - */ > -DWORD WINAPI RegDeleteKey16( HKEY hkey, LPCSTR name ) > -{ > - fix_win16_hkey( &hkey ); > - return RegDeleteKeyA( hkey, name ); > -} > - > -/****************************************************************************** > - * RegSetValue [SHELL.5] > - */ > -DWORD WINAPI RegSetValue16( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWORD count ) > -{ > - fix_win16_hkey( &hkey ); > - return RegSetValueA( hkey, name, type, data, count ); > -} > - > -/****************************************************************************** > - * RegQueryValue [SHELL.6] > - * > - * NOTES > - * Is this HACK still applicable? > - * > - * HACK > - * The 16bit RegQueryValue doesn't handle selectorblocks anyway, so we just > - * mask out the high 16 bit. This (not so much incidently) hopefully fixes > - * Aldus FH4) > - */ > -DWORD WINAPI RegQueryValue16( HKEY hkey, LPCSTR name, LPSTR data, LPDWORD count ) > -{ > - fix_win16_hkey( &hkey ); > - if (count) *count &= 0xffff; > - return RegQueryValueA( hkey, name, data, count ); > -} > - > -/****************************************************************************** > - * RegEnumKey [SHELL.7] > - */ > -DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len ) > -{ > - fix_win16_hkey( &hkey ); > - return RegEnumKeyA( hkey, index, name, name_len ); > -} > Index: dlls/shell32/shlexec.c > =================================================================== > RCS file: /home/wine/wine/dlls/shell32/shlexec.c,v > retrieving revision 1.8 > diff -u -r1.8 shlexec.c > --- dlls/shell32/shlexec.c 16 Sep 2002 19:27:51 -0000 1.8 > +++ dlls/shell32/shlexec.c 12 Oct 2002 17:07:59 -0000 > @@ -673,35 +673,6 @@ > return TRUE; > } > > - > -/************************************************************************* > - * ShellExecute [SHELL.20] > - */ > -HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation, > - LPCSTR lpFile, LPCSTR lpParameters, > - LPCSTR lpDirectory, INT16 iShowCmd ) > -{ > - SHELLEXECUTEINFOA sei; > - HANDLE hProcess = 0; > - > - sei.cbSize = sizeof(sei); > - sei.fMask = 0; > - sei.hwnd = HWND_32(hWnd); > - sei.lpVerb = lpOperation; > - sei.lpFile = lpFile; > - sei.lpParameters = lpParameters; > - sei.lpDirectory = lpDirectory; > - sei.nShow = iShowCmd; > - sei.lpIDList = 0; > - sei.lpClass = 0; > - sei.hkeyClass = 0; > - sei.dwHotKey = 0; > - sei.hProcess = hProcess; > - > - ShellExecuteExA32 (&sei, FALSE); > - return (HINSTANCE16)sei.hInstApp; > -} > - > /************************************************************************* > * ShellExecuteA [SHELL32.290] > */ > -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

1 1

Re: improve scanf
by György 'Nog' Jeney 12 Oct '02

12 Oct '02

Ooops, that patch has got an error in it, use this one instead. > ChangeLog: > * dlls/msvcrt/scanf.c > * dlls/msvcrt/scanf.h > Implement [ format specifier. > > nog.

1 0

Re: MZ_Exec() patch, try 2
by Jukka Heinonen 12 Oct '02

12 Oct '02

> This look more reasonable? Yep. Only a few bugs left. Because cmdline buffer belongs to the calling application you should not modify the buffer. Use of memcpy or something like that would be recommended. Also, use of variable "status" is a mystery to me. If CreateProcessA fails, it might not initialize handles and even if it does not fail, they might be null handles (I don't know if that matters, though). -- Jukka Heinonen <http://www.iki.fi/jhei/>

1 0

configuring wine under mingw
by David Fraser 12 Oct '02

12 Oct '02

When running configure on wine under mingw, I had problems creating secure temporary directories... The configure code has two options for creating a secure temporary directory. If the first method fails the second is used. The difficulty with the first one is that mktemp returns a Windows-style path ("C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\cscP2080") instead of a Unix-style one (/tmp/cscP2080) Since the backslashes are not escaped this then causes problems later when the temporary path is passed to sed as it cannot find C:DOCUME~1ADMINI~1LOCALS~1TempcscP2080/subs.sed This is actually because mingw/msys converts the unix-style path passed in to mktemp to a Windows-style one in the first place. Actually mingw does not have mktemp and the reason it was finding mktemp is that the cygwin directory was in my path. Removing the cygwin path fixes this problem, but then I don't have access to bison and yacc, so configure fails As an alternate solution, If I disallow the first of the two options on cygwin, then the tmp variable is set to /tmp/cs* and so it proceeds fine --- configure 10 Oct 2002 17:54:27 -0000 1.349 +++ configure 11 Oct 2002 13:55:36 -0000 @@ -14315,9 +14315,17 @@ } # Create a (secure) tmp directory for tmp files. +host_os=`echo $ac_cv_host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'` +# disallow mktemp on mingw +case $MSYSTEM in + MINGW32*) + allowmktemp= ;; + *) + allowmktemp=yes ;; +esac : ${TMPDIR=/tmp} { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + [ $allowmktemp ] && tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { I thought the logical thing to check was $host_os to see if we were running mingw. But when I tried it didn't seem to work :-) Not sure if this configure is autogenerated or if this patch is applicable, but thought others trying the same thing might find this helpful... David Fraser

3 2

Different window handles
by Medland, Bill 11 Oct '02

11 Oct '02

What is the difference between window handles 100nn and 200nn? I am trying to figure out why our program behaves differently between KDE and Gnome. One fundamental difference is a particular window is allocated as 20033 under kde (and behaves correctly) whereas it comes back as 1003f under Gnome (and behaves incorrectly) Bill

2 1

Problem in file dlls/commdlg/filedlg.c
by Lozano, Carlos A. 11 Oct '02

11 Oct '02

Hello, In the line 655, there is a test for when ofnW->lpstrFile is null > if (ofnW->lpstrFile) but a bit later in line 689,690 there is not the same check, then if ofnW->nMaxFile is 0 because ofnW->lpstrFile is null, then the line 690 write in a negative pos: > lfs->ofnA->lpstrFile[ofnW->nMaxFile-1] = 0; so mirc591t.exe installer crashes when tries change the drive in the browse option. Can someone fix it? Regards, Carlos. -- _______________________________________________________ _/_ / / \/ ANDAGO |-- [ Infraestructuras - Andago.com ] \____/\ [ email:carlos.lozano@andago.com ] ______\__\_____________________________________________

1 0

Re: wine/dlls/avifil32: implemented many functions
by Greg Turner 11 Oct '02

11 Oct '02

On Friday 11 October 2002 04:49 pm, Michael Günnewig wrote: > Hallo. > > This patch adds many functionality to the avifil32.dll. It's now > possible to use the wine/programs/avitools/aviinfo programm. > > - added DllCanUnloadNow, DllGetClassObject to avifil32.spec > - implemented AVIFileOpenW > - implemented many functions of the AVI filehandler. > - added resources to avifil32 > - added FIND_* consts to include/vfw.h > - added registry entries for avifile.dll and avifil32.dll Without bothering to properly look into it for myself, might I ask what this does? + /* adjust permissions if copyrighted material in file */ + if (MainAVIHdr.dwFlags & AVIFILEINFO_COPYRIGHTED) { + This->uMode &= ~MMIO_RWMODE; -- gmt "It has been well said that really up-to-date liberals do not care what people do, as long as it is compulsory." -George F. Will

1 0

Re: winapi_test update
by Alexandre Julliard 11 Oct '02

11 Oct '02

Patrik Stridvall <ps(a)leissner.se> writes: > *** include_test_generated > > * include/wine/test_generated.h: > New include file with helpers for the generated tests. I think it would be better to put these macros in each generated C file. The code duplication doesn't hurt since it's all generated code anyway, and I'd rather avoid creating yet another global include. -- Alexandre Julliard julliard(a)winehq.com

1 0

Exception with ocx not caught
by Fabian Cenedese 11 Oct '02

11 Oct '02

Hi I already posted about this problem, now maybe someone else is able to help me. Creating ocx: http://www.winehq.com/hypermail/wine-devel/2002/09/0021.html Catching MFC exception: http://www.winehq.com/hypermail/wine-devel/2002/09/0057.html I now have a simple ocx and an exe that has nothing else than this ocx in it. The ocx appears as black circle on white ground in the upper left corner (right, the wizard made ocx) In Windows it works without a problem but in wine there's an exception upon creating the ocx. It happens with both builtin and native msvcrt.dll. I can see that some exceptions are raised about missing properties in the ocx, they also appear on Windows (debug output) and get caught before doing any harm. I sometimes had problems reproducing it. Then the dialog came up but without ocx. Both exe and ocx are made with MSVC6 (Project and binaries, debug/release): http://www.indel.ch/ftp/TestException.zip Also here is a backtrace at the moment of the exception: http://www.indel.ch/ftp/TestException.txt Alexandre once asked for an example, maybe he or someone else can use this here. I'm using actual wine from cvs on SuSE8, original dlls tried from NT4. Thanks bye Fabi

3 3

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