January 2005 - Wine-Devel - list.winehq.org

Re: PSAPI: stub implementations (#3)
by Juan Lang Jan. 16, 2005

Jan. 16, 2005

Hi Hans, +BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size ) +{ + NTSTATUS status; + + TRACE( "(%p, %ld)\n", info, size ); + + status = NtQueryInformationProcess( GetCurrentProcess(), SystemPerformanceInformation, info, size, NULL ); + + if (status) + { + SetLastError( RtlNtStatusToDosError( status )); + return FALSE + } + return FALSE; Shouldn't this return TRUE on success? --Juan __________________________________ Do you Yahoo!? Read only the mail you want - Yahoo! Mail SpamGuard. http://promotions.yahoo.com/new_mail

1 0

Re: PSAPI: stub implementations (#2)
by Rob Shearman Jan. 15, 2005

Jan. 15, 2005

Hans Leidekker wrote: >Call SetLastError() on failure, as suggested by Juan Lang. > > -Hans > >Changelog: > Stub implementations for EnumPageFiles{A,W}, GetProcessImageFileName{A,W}. > Implement GetPerformanceInfo, GetProcessMemoryInfo on top of > NtQueryInformationProcess and GetWsChanges, QueryWorkingSet{,Ex} on top > of NtQueryVirtualMemory. > > >------------------------------------------------------------------------ > >@@ -443,15 +461,85 @@ > } > > /*********************************************************************** >+ * GetPerformanceInfo (PSAPI.@) >+ */ >+BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size ) >+{ >+ NTSTATUS status; >+ >+ TRACE( "(%p, %ld)\n", info, size ); >+ >+ if (size < sizeof(PERFORMANCE_INFORMATION)) >+ { >+ SetLastError( ERROR_INSUFFICIENT_BUFFER ); >+ return FALSE; >+ } >+ > > This check is redundant. All NtQueryInformation* functions check the buffer size for you. >+ status = NtQueryInformationProcess( GetCurrentProcess(), SystemPerformanceInformation, info, size, NULL ); >+ >+ if (status) >+ { >+ SetLastError( RtlNtStatusToDosError( status )); >+ return FALSE >+ } >+ return FALSE; >+} > > >@@ -459,14 +547,25 @@ > /*********************************************************************** > * GetWsChanges (PSAPI.@) > */ >-BOOL WINAPI GetWsChanges(HANDLE hProcess, >- PPSAPI_WS_WATCH_INFORMATION lpWatchInfo, DWORD cb) >+BOOL WINAPI GetWsChanges( HANDLE process, PPSAPI_WS_WATCH_INFORMATION watchinfo, DWORD size ) > { >- FIXME("(hProcess=%p, %p, %ld): stub\n", >- hProcess, lpWatchInfo, cb); >+ NTSTATUS status; >+ >+ TRACE( "(%p, %p, %ld)\n", process, watchinfo, size ); >+ >+ if (size < sizeof(PSAPI_WS_WATCH_INFORMATION)) >+ { >+ SetLastError( ERROR_INSUFFICIENT_BUFFER ); >+ return FALSE; >+ } > > So is this. > >- memset(lpWatchInfo, 0, cb); >+ status = NtQueryVirtualMemory( process, NULL, ProcessWorkingSetWatch, watchinfo, size, NULL ); > >+ if (status) >+ { >+ SetLastError( RtlNtStatusToDosError( status )); >+ return FALSE >+ } > return TRUE; > } > > > Could you also make sure that the NtDll functions that you are calling give out a useful fixme message when called from these functions? At the moment you are mostly replacing some good fixme messages with bad fixme messages. Rob

1 0

Re: PSAPI: stub implementations
by Juan Lang Jan. 15, 2005

Jan. 15, 2005

Hi Hans, + status = NtQueryInformationProcess( GetCurrentProcess(), SystemPerformanceInformation, info, size, NULL ); + if (status != STATUS_SUCCESS) return FALSE; without a test case I don't know for sure, but it seems likely you should do the something like following on failure: if (status) { SetLastError( RtlNtStatusToDosError( status )); return FALSE; } You might take a look at how advapi32's security.c does it. --Juan __________________________________ Do you Yahoo!? Meet the all-new My Yahoo! - Try it today! http://my.yahoo.com

1 0

Re: WineHQ:winetest: produce valid HTML
by Dimitrie O. Paun Jan. 15, 2005

Jan. 15, 2005

On Wed, Jan 12, 2005 at 05:29:18PM +0100, Ferenc Wagner wrote: > ChangeLog: * Generate valid HTML 4.01 Strict. > * Underline vis_note class links, too. Cool stuff Feri. Anyone knows what happened to the tests? The last one at http://test.winehq.org/data/ is 2004-12-28. Also, the last tests build at SF is winetest-200409111000 which is a bit outdated :) What gives? -- Dimi.

8 20

file associations in wine
by Rainer Haake Jan. 15, 2005

Jan. 15, 2005

hi there first of all, please excuse my poor english... I know I can associate a file extension in wine with a linux application like i did for .sxw in this .reg-file: REGEDIT4 [HKEY_CLASSES_ROOT\.sxw] @="sxw.document" [HKEY_CLASSES_ROOT\sxw.document] @="sxw.document" [HKEY_CLASSES_ROOT\sxw.document\shell] [HKEY_CLASSES_ROOT\sxw.document\shell\open] [HKEY_CLASSES_ROOT\sxw.document\shell\open\command] @="C:\\windows\\command\\start.exe kdestart.exe \"%1\"" where kdestart.exe is a link to the following script: #!/bin/bash i=`winepath -u "$*"` kfmclient exec "$i" so now sxw-files open in OpenOffice like I wanted. But now I would like to have a file association to each filetype unknown to wine, so that all these files will be openend with the corresponding KDE programs. I tried: [HKEY_CLASSES_ROOT\*] [HKEY_CLASSES_ROOT\*\shell] [HKEY_CLASSES_ROOT\*\shell\open] [HKEY_CLASSES_ROOT\*\shell\open\command] @="C:\\windows\\command\\start.exe kdestart.exe \"%1\"" because i thought that would be the default file association, but it doesn't work... Is this possible? It would be a great step for the integration of wine with KDE (or GNOME, because a similar script could be developed) thanks for any help Rainer

1 0

Sharing files between users
by Vitaly Lipatov Jan. 14, 2005

Jan. 14, 2005

I am looking for any resolve a problem with sharing open files. When one user calls CreateFile with sharing=FILE_SHARE_READ, other user can open the same file with sharing=FILE_SHARE_WRITE wthout any fails. I know sharing control done in wine-server, but it resolves problem only when single user sharing files, not two or more. I guess to move sharing support in kernel in some way. Any suggestions? -- Vitaly Lipatov, ALT Linux Team Russia, Saint-Petersburg, www.etersoft.ru

1 0

Re: Janitorial : add missing declarations ( #3 )
by Dmitry Timoshkov Jan. 14, 2005

Jan. 14, 2005

"Rémi Assailly" <remi.assailly(a)free.fr> wrote: > diff -u dlls/x11drv/x11drv_main.c dlls/x11drv/x11drv_main.c > --- dlls/x11drv/x11drv_main.c 2004-12-08 18:27:53.000000000 +0100 > +++ dlls/x11drv/x11drv_main.c 2005-01-12 21:23:02.000000000 +0100 > @@ -119,6 +119,8 @@ > #define IS_OPTION_FALSE(ch) \ > ((ch) == 'n' || (ch) == 'N' || (ch) == 'f' || (ch) == 'F' || (ch) == '0') > > +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ); This one should not be needed. -- Dmitry.

2 1

WineConf 2005
by Brian Vincent Jan. 14, 2005

Jan. 14, 2005

WINECONF 2005 GOES TO EUROPE! We have a tentative reservation for Wineconf and we'd like some feedback regarding dates and times: WHERE: Stuttgart, Germany WHEN: April 30 / May 1st (plan on arriving April 29th) We realize it's not possible to accomodate everyone's schedule, but these dates seem to work nicely for a lot of people. In addition, SambaXP will be held May 2nd and 3rd near the area, so this event may attract some other folks interested in this stuff. Can anyone foresee any glaring problems with the location and dates? Otherwise, we'll move forward with firming up the plans and send an official announcement later in the week. -Brian

2 1

Re: Add WM_GETOBJECT definition, remove WM_OTHERWINDOWCREATED define
by Robert North Jan. 14, 2005

Jan. 14, 2005

Dmitry Timoshkov dmitry-at-baikal.ru |Wine Mailing Lists| wrote: > Hello, > > Platform SDK defines WM_GETOBJECT as 0x003d and doesn't have a > message with value 0x003c at all. WM_GETOBJECT is used by Active > Accessibility to retrieve an interface pointer from a window. > > Changelog: Dmitry Timoshkov <dmitry(a)codeweavers.com> Add WM_GETOBJECT > definition, remove WM_OTHERWINDOWCREATED define. > > diff -up cvs/hq/wine/include/winuser.h wine/include/winuser.h --- > cvs/hq/wine/include/winuser.h 2005-01-10 13:55:58.000000000 +0800 +++ > wine/include/winuser.h 2005-01-14 16:23:38.000000000 +0800 @@ -985,8 > +985,8 @@ BOOL WINAPI SetSysColors(INT,cons #define > WM_COMPAREITEM 0x0039 #define WM_TESTING 0x003a > > > -#define WM_OTHERWINDOWCREATED 0x003c -#define > WM_OTHERWINDOWDESTROYED 0x003d I thought this removal looked a bit suspicious... So, I did a quick google for WM_OTHERWINDOWCREATED , and there seems to be a consensus that these two messages are defined as follows: WM_OTHERWINDOWCREATED 0x00000042 WM_OTHERWINDOWDESTROYED 0x00000043 What do you think? Should google be trusted? P.S. If yo do the google search, there's a link to a Russian windows internals book that may shed further light on these methods. Bye -Rob.

2 1

Re: advpack: add two missing stubs
by Robert Reif Jan. 14, 2005

Jan. 14, 2005

Robert Reif wrote: > Add stubs for NeedReboot and NeedRebootInit. > without FIXME bug Index: dlls/advpack/advpack.c =================================================================== RCS file: /home/wine/wine/dlls/advpack/advpack.c,v retrieving revision 1.6 diff -u -r1.6 advpack.c --- dlls/advpack/advpack.c 15 Dec 2004 10:52:57 -0000 1.6 +++ dlls/advpack/advpack.c 11 Jan 2005 00:57:39 -0000 @@ -96,3 +96,28 @@ return ret; } + +/*********************************************************************** + * NeedRebootInit (ADVPACK.@) + */ +DWORD WINAPI NeedRebootInit(VOID) +{ + FIXME("() stub!\n"); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return 0; +} + +/*********************************************************************** + * NeedReboot (ADVPACK.@) + */ + +BOOL WINAPI NeedReboot(DWORD dwRebootCheck) +{ + FIXME("(0x%08lx) stub!\n", dwRebootCheck); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return FALSE; +} Index: dlls/advpack/advpack.spec =================================================================== RCS file: /home/wine/wine/dlls/advpack/advpack.spec,v retrieving revision 1.4 diff -u -r1.4 advpack.spec --- dlls/advpack/advpack.spec 15 Dec 2004 10:52:57 -0000 1.4 +++ dlls/advpack/advpack.spec 11 Jan 2005 00:57:39 -0000 @@ -15,8 +15,8 @@ @ stub IsNTAdmin @ stdcall LaunchINFSection(ptr ptr str long) @ stdcall LaunchINFSectionEx(ptr ptr str long) -@ stub NeedReboot -@ stub NeedRebootInit +@ stdcall NeedReboot(long) +@ stdcall NeedRebootInit() @ stub OpenINFEngine @ stub RebootCheckOnInstall @ stdcall RegInstall(ptr str ptr)

4 7

Re: [AppDB] layout corners size
by Dimitrie O. Paun Jan. 14, 2005

Jan. 14, 2005

On Fri, Jan 14, 2005 at 01:58:25PM +0100, Jonathan Ernst wrote: > After doing it for lostwages I did the same for AppDB. Cool, don't forget Bugzilla too :) -- Dimi.

1 0

Re: [Fwd: OLEAUT32: VARIANT parsing of hex/octal integer string must not negate value]
by Alexandre Julliard Jan. 14, 2005

Jan. 14, 2005

Alex Villacis Lasso <a_villacis(a)palosanto.com> writes: > Apparently this patch did not make it in time for the 20050111 > release, so I am resending it. Could you please submit a test case for this? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: listview: fix alignment tests
by Paul Vriens Jan. 14, 2005

Jan. 14, 2005

Dimitrie O. Paun wrote: > > ChangeLog > Use the LVCFMT_{LEFT,RIGHT,CENTER} enumeration flags properly. > > /* set text alignment (leftmost column must be left-aligned) */ > - if (nColumn == 0 || lpColumn->fmt & LVCFMT_LEFT) > + if (nColumn == 0 || (lpColumn->fmt & LVCFMT_JUSTIFYMASK) == > LVCFMT_LEFT) > lphdi->fmt |= HDF_LEFT; HDF_LEFT is also 0, so should we get rid of the first check, and only check for LVCFMT_RIGHT and LVCFMT_CENTER? > > if (lpColumn->fmt & LVCFMT_BITMAP_ON_RIGHT) > > -- > Dimi. > > Cheers, Paul.

2 1

Re: Writing a driver for scanners
by gslink Jan. 14, 2005

Jan. 14, 2005

The other day I came across a wrapper for wireless lan drivers that uses the XP driver and loads it into Linux. Driver interfaces in Windows are fairly standard for a certain type of device. I suggest you look on the web for sites that list drivers and see if something like this is available. If it is not then add to the wifi wrapper so that it handles the XP or 2000 driver that came with your scanner. The resulting code would be very valuable to both Wine and Linux especially if it allowed the use of an XP driver for the thousands of special devices that only have XP drivers. Start by looking at www.linuxdrivers.org.

1 0

WineHQ: suggested improvement
by Dimitrie O. Paun Jan. 14, 2005

Jan. 14, 2005

Hi folks, I haven't looked at the template system to see how easy this would be, but I have one problem with the site as it is now, that may be very easy to solve. Namely, when you load it first time, the browser doesn't know to render all the corners (since they are all images), and as a result the layout happens in stages, and it's annoying. Can we please provide _explicit_ sizes for <img>es like these: <img src="./images/winehq_border_top_right.gif" alt=""> <img src="./images/winehq_border_bottom_right.gif" alt=""> ... This should take care of this little annoyance, and would make the site feel better. -- Dimi.

2 1

Wine and FreeBSD
by Jason But Jan. 14, 2005

Jan. 14, 2005

Hello all, First, happy to see the new release of WINE 20050111 for FreeBSD (and previous 20041201) I obtained and compiled the latest version for my standard FreeBSD 5.3 install. Upon running any windows/wine app I get the error messages err:heap:HEAP_CreateSystemHeap system heap base address 0x80000000 not available err:heap:HEAP_CreateSystemHeap system heap base address 0x80000000 not available err:heap:HEAP_GetPtr Invalid heap 0x0! err:heap:HEAP_GetPtr Invalid heap 0x0! err:heap:HEAP_GetPtr Invalid heap 0x0! err:heap:HEAP_GetPtr Invalid heap 0x0! Some apps (if they do not use the heap) continue to run, the apps I want to use (MS Office 2000 - Word/Excel/PowerPoint) fail as follows: ------------------------ MS Word will display the splash screen and then a message box with "There is not enough memory or disk space to run Word." before crashing ------------------------ MS Excel will start with the message box "Cannot use object linking and embedding" before starting, but attempting use excel will result in an out of memory error and then a crash ------------------------ MS PowerPoint doesn't even start. ------------------------ This is dissapointing, we have managed (http://caia.swin.edu.au/reports/041129A) to install MS Office 2K on WINE 20040505 under FreeBSD but were hoping that this newer version would fix our two discovered problems (the new file.. dialog and the pulldown menus if more than one office app is running). Unfortunately, it seems that the new version breaks everything. Further pottering around found... HEAP_CreateSystemHeap() calls MapViewOfFileEx() which calls NtMapViewOfSection() which calls map_view() which attempts a normal allocation - wine_mmap_is_in_reserved_area() == 0 calling wine_anon_mmap() The returned pointer is valid so wine_anon_mmap() succeeds BUT the returned ptr != base and so the function returns STATUS_CONFLICTING_ADDRESSES which returns up the chain and the heap allocation fails. On my system base being requested is 0x80000000 and ptr being returned is 0x9996d000. This result then fails the is_beyond_limit() test... Any clues would help!! Thanks. Jason

1 0

The use of a zero flag
by Paul Vriens Jan. 14, 2005

Jan. 14, 2005

Hi, a few days ago I found a bug in ole32/compobj.c where we did something like: if ( foo & FLAG) .... where FLAG=0 This 'inspired' me to check for more of these kind of checks. One that I already found is in dlls/dplayx/dplay.c We are checking for DPSET_REMOTE (which is zero) where we should have checked for !DPSET_LOCAL or something alike. Is it worthwhile to set up a Janitorial task for this or are these plain bugs? On the one hand it will be hard to find these and you have to know the code of course. Cheers, Paul.

3 5

WINE and FreeBSD
by Jason But Jan. 14, 2005

Jan. 14, 2005

Hello all, I wasn't quite sure which list to post this on (no flames please) First, happy to see the new release of WINE 20050111 for FreeBSD (and previous 20041201) I obtained and compiled the latest version for my standard FreeBSD 5.3 install. Upon running any windows/wine app I get the error messages err:heap:HEAP_CreateSystemHeap system heap base address 0x80000000 not available err:heap:HEAP_CreateSystemHeap system heap base address 0x80000000 not available err:heap:HEAP_GetPtr Invalid heap 0x0! err:heap:HEAP_GetPtr Invalid heap 0x0! err:heap:HEAP_GetPtr Invalid heap 0x0! err:heap:HEAP_GetPtr Invalid heap 0x0! Some apps (if they do not use the heap) continue to run, the apps I want to use (MS Office 2000 - Word/Excel/PowerPoint) fail as follows: ------------------------ MS Word will display the splash screen and then a message box with "There is not enough memory or disk space to run Word." before crashing ------------------------ MS Excel will start with the message box "Cannot use object linking and embedding" before starting, but attempting use excel will result in an out of memory error and then a crash ------------------------ MS PowerPoint doesn't even start. ------------------------ This is dissapointing, we have managed (http://caia.swin.edu.au/reports/041129A) to install MS Office 2K on WINE 20040505 under FreeBSD but were hoping that this newer version would fix our two discovered problems (the new file.. dialog and the pulldown menus if more than one office app is running). Unfortunately, it seems that the new version breaks everything. Further pottering around found... HEAP_CreateSystemHeap() calls MapViewOfFileEx() which calls NtMapViewOfSection() which calls map_view() which attempts a normal allocation - wine_mmap_is_in_reserved_area() == 0 calling wine_anon_mmap() The returned pointer is valid so wine_anon_mmap() succeeds BUT the returned ptr != base and so the function returns STATUS_CONFLICTING_ADDRESSES which returns up the chain and the heap allocation fails. On my system base being requested is 0x80000000 and ptr being returned is 0x9996d000. This result then fails the is_beyond_limit() test... Any clues would help!! Thanks. Jason

1 0

Re: Keyboard+Ukrainian
by Dmitry Timoshkov Jan. 14, 2005

Jan. 14, 2005

"Oleh R. Nykyforchyn" <nick(a)pu.if.ua> wrote: > I propose two patches to Wine20050111 (sorry for not using CVS, but I have rather > slow dialup connection). First is more or less obvious: current cp_20866.c page > includes only Russian KOI8-R codes and is insufficient for Ukrainian and Byelarussian users. > It is easy to add four Ukrainian pairs and one Byelarussian pair of letters (in fact, > move to KOI8-RU). I patched the Perl script an regenerated cp_20866.c: You can't do that. Windows has a distinct code page for Ukrainian and Byelarussian, it's 21866. > Second proposal is more complicated. I have four XKB groups in my X.org > (Latin + 3 cyrillic encodings), and, moreover, use overlays to switch > between Ukrainian and Russian. This approach is typical among Cyrillic > Linux users. Of course, wine cannot handle my case, so I partially rewrote > keyboard.c to take care of groups and overlays switching if XKB is present. > Now You can have four independent layouts up to four shift levels in each. > If XKB is absent, wine will behave as before. Driver will switch internal > XKB group counter each time when looked up symbol doesn't match previously > built tables. If this doesn't help, the whole layout ONLY FOR THIS GROUP > (to save time) will be refreshed. The real fix for your problem is to add a proper support for keyboard layouts, and switch internal x11drv layout on an appropriate X event. -- Dmitry.

1 0

Code cleanup: SHFileOperationW
by Joris Huizer Jan. 14, 2005

Jan. 14, 2005

Hi, I took out a part of the function SHFileOperationW and put it in a new function - please give any comments: is this the way to make this function more readable you want it? what is a better way of calling such a function? regards, Joris ? .patch.diff.swp ? backup-010320051808-pre-wine.tgz ? backup-010920052053-pre-wine.tgz ? backup-011120051329-pre-wine.tgz ? backup-011120051339-pre-wine.tgz ? backup-011220050008-pre-wine.tgz ? backup-123120041614-pre-wine.tgz ? badrefs ? description-pak ? doc-pak ? getrefs ? patch.diff ? ref ? refs ? versions ? wine-working.deb ? wine_cvs-041231-1_i386.deb ? wine_cvs-050103-1_i386.deb ? wine_cvs-050109-1_i386.deb ? wine_cvs-050111.noalsa-1_i386.deb ? wine_cvs-050112.release-1_i386.deb ? programs/notepad2 Index: dlls/shell32/shlfileop.c =================================================================== RCS file: /home/wine/wine/dlls/shell32/shlfileop.c,v retrieving revision 1.50 diff -u -r1.50 shlfileop.c --- dlls/shell32/shlfileop.c 23 Dec 2004 17:12:07 -0000 1.50 +++ dlls/shell32/shlfileop.c 13 Jan 2005 14:13:33 -0000 @@ -861,6 +861,40 @@ #define ERROR_SHELL_INTERNAL_FILE_NOT_FOUND 1026 #define HIGH_ADR (LPWSTR)0xffffffff +static int WINAPI SHFileOperationW_delete( WIN32_FIND_DATAW *wfd,SHFILEOPSTRUCTW nFileOp, LPWSTR pFromFile,LPWSTR pTempFrom,HANDLE hFind) + +{ + LPWSTR lpFileName; + BOOL b_Mask = (NULL != StrPBrkW(&pFromFile[1], wWildcardChars)); + int retCode = 0; + do + { + lpFileName = wfd->cAlternateFileName; + if (!lpFileName[0]) + lpFileName = wfd->cFileName; + if (IsDotDir(lpFileName) || + ((b_Mask) && IsAttribDir(wfd->dwFileAttributes) && (nFileOp.fFlags & FOF_FILESONLY))) + continue; + SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); + /* TODO: Check the SHELL_DeleteFileOrDirectoryW() function in shell32.dll */ + if (IsAttribFile(wfd->dwFileAttributes)) + { + if(SHNotifyDeleteFileW(pTempFrom) != ERROR_SUCCESS) + { + nFileOp.fAnyOperationsAborted = TRUE; + retCode = 0x78; /* value unknown */ + } + } + else if(!SHELL_DeleteDirectoryW(pTempFrom, (!(nFileOp.fFlags & FOF_NOCONFIRMATION)))) + { + nFileOp.fAnyOperationsAborted = TRUE; + retCode = 0x79; /* value unknown */ + } + } + while (!nFileOp.fAnyOperationsAborted && FindNextFileW(hFind,wfd)); + return retCode; +} + /************************************************************************* * SHFileOperationW [SHELL32.@] * @@ -1080,33 +1114,9 @@ /* ??? b_Mask = (!SHFileStrICmpA(&pFromFile[1], &wfd.cFileName[0], HIGH_ADR, HIGH_ADR)); */ if (!pTo) /* FO_DELETE */ { - do - { - lpFileName = wfd.cAlternateFileName; - if (!lpFileName[0]) - lpFileName = wfd.cFileName; - if (IsDotDir(lpFileName) || - ((b_Mask) && IsAttribDir(wfd.dwFileAttributes) && (nFileOp.fFlags & FOF_FILESONLY))) - continue; - SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); - /* TODO: Check the SHELL_DeleteFileOrDirectoryW() function in shell32.dll */ - if (IsAttribFile(wfd.dwFileAttributes)) - { - if(SHNotifyDeleteFileW(pTempFrom) != ERROR_SUCCESS) - { - nFileOp.fAnyOperationsAborted = TRUE; - retCode = 0x78; /* value unknown */ - } - } - else - { - if(!SHELL_DeleteDirectoryW(pTempFrom, (!(nFileOp.fFlags & FOF_NOCONFIRMATION)))) - { - nFileOp.fAnyOperationsAborted = TRUE; - retCode = 0x79; /* value unknown */ - } - } - } while (!nFileOp.fAnyOperationsAborted && FindNextFileW(hFind, &wfd)); + int ret = SHFileOperationW_delete(&wfd,nFileOp,pFromFile,pTempFrom,hFind); + if (ret != 0) + retCode = ret; FindClose(hFind); hFind = INVALID_HANDLE_VALUE; if (nFileOp.fAnyOperationsAborted) Index: dlls/wined3d/basetexture.c =================================================================== RCS file: /home/wine/wine/dlls/wined3d/basetexture.c,v retrieving revision 1.2 diff -u -r1.2 basetexture.c --- dlls/wined3d/basetexture.c 9 Jan 2005 17:37:02 -0000 1.2 +++ dlls/wined3d/basetexture.c 13 Jan 2005 14:13:34 -0000 @@ -37,16 +37,17 @@ ULONG WINAPI IWineD3DBaseTextureImpl_AddRef(IWineD3DBaseTexture *iface) { IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - TRACE("(%p) : AddRef increasing from %ld\n", This, This->resource.ref); + ULONG ref = InterlockedIncrement(&This->resource.ref); + + TRACE("(%p) : AddRef increasing from %ld\n", This,ref - 1); IUnknown_AddRef(This->resource.parent); - return InterlockedIncrement(&This->resource.ref); + return ref; } ULONG WINAPI IWineD3DBaseTextureImpl_Release(IWineD3DBaseTexture *iface) { IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - ULONG ref; - TRACE("(%p) : Releasing from %ld\n", This, This->resource.ref); - ref = InterlockedDecrement(&This->resource.ref); + ULONG ref = InterlockedDecrement(&This->resource.ref); + TRACE("(%p) : Releasing from %ld\n", This, ref + 1); if (ref == 0) { IWineD3DDevice_Release((IWineD3DDevice *)This->resource.wineD3DDevice); HeapFree(GetProcessHeap(), 0, This); Index: dlls/wined3d/indexbuffer.c =================================================================== RCS file: /home/wine/wine/dlls/wined3d/indexbuffer.c,v retrieving revision 1.4 diff -u -r1.4 indexbuffer.c --- dlls/wined3d/indexbuffer.c 9 Jan 2005 17:37:02 -0000 1.4 +++ dlls/wined3d/indexbuffer.c 13 Jan 2005 14:13:34 -0000 @@ -38,16 +38,16 @@ ULONG WINAPI IWineD3DIndexBufferImpl_AddRef(IWineD3DIndexBuffer *iface) { IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface; - TRACE("(%p) : AddRef increasing from %ld\n", This, This->resource.ref); + ULONG ref = InterlockedIncrement(&This->resource.ref); + TRACE("(%p) : AddRef increasing from %ld\n", This, ref - 1); IUnknown_AddRef(This->resource.parent); - return InterlockedIncrement(&This->resource.ref); + return ref } ULONG WINAPI IWineD3DIndexBufferImpl_Release(IWineD3DIndexBuffer *iface) { IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface; - ULONG ref; - TRACE("(%p) : Releasing from %ld\n", This, This->resource.ref); - ref = InterlockedDecrement(&This->resource.ref); + ULONG ref = InterlockedDecrement(&This->resource.ref); + TRACE("(%p) : Releasing from %ld\n", This, ref + 1); if (ref == 0) { HeapFree(GetProcessHeap(), 0, This->allocatedMemory); IWineD3DDevice_Release((IWineD3DDevice *)This->resource.wineD3DDevice); Index: dlls/wined3d/resource.c =================================================================== RCS file: /home/wine/wine/dlls/wined3d/resource.c,v retrieving revision 1.4 diff -u -r1.4 resource.c --- dlls/wined3d/resource.c 9 Jan 2005 17:37:02 -0000 1.4 +++ dlls/wined3d/resource.c 13 Jan 2005 14:13:34 -0000 @@ -36,15 +36,15 @@ ULONG WINAPI IWineD3DResourceImpl_AddRef(IWineD3DResource *iface) { IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - TRACE("(%p) : AddRef increasing from %ld\n", This, This->resource.ref); - return InterlockedIncrement(&This->resource.ref); + ULONG ref = InterlockedIncrement(&This->resource.ref); + TRACE("(%p) : AddRef increasing from %ld\n", This, ref - 1); + return ref; } ULONG WINAPI IWineD3DResourceImpl_Release(IWineD3DResource *iface) { IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - ULONG ref; - TRACE("(%p) : Releasing from %ld\n", This, This->resource.ref); - ref = InterlockedDecrement(&This->resource.ref); + ULONG ref = InterlockedDecrement(&This->resource.ref); + TRACE("(%p) : Releasing from %ld\n", This, ref + 1); if (ref == 0) { IWineD3DDevice_Release((IWineD3DDevice *)This->resource.wineD3DDevice); HeapFree(GetProcessHeap(), 0, This); Index: dlls/wined3d/surface.c =================================================================== RCS file: /home/wine/wine/dlls/wined3d/surface.c,v retrieving revision 1.1 diff -u -r1.1 surface.c --- dlls/wined3d/surface.c 9 Jan 2005 17:37:02 -0000 1.1 +++ dlls/wined3d/surface.c 13 Jan 2005 14:13:35 -0000 @@ -38,16 +38,16 @@ ULONG WINAPI IWineD3DSurfaceImpl_AddRef(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - TRACE("(%p) : AddRef increasing from %ld\n", This, This->resource.ref); + ULONG ref = InterlockedIncrement(&This->resource.ref); + TRACE("(%p) : AddRef increasing from %ld\n", This,ref - 1); IUnknown_AddRef(This->resource.parent); - return InterlockedIncrement(&This->resource.ref); + return ref } ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - ULONG ref; - TRACE("(%p) : Releasing from %ld\n", This, This->resource.ref); - ref = InterlockedDecrement(&This->resource.ref); + ULONG ref = InterlockedDecrement(&This->resource.ref); + TRACE("(%p) : Releasing from %ld\n", This, ref + 1); if (ref == 0) { HeapFree(GetProcessHeap(), 0, This->allocatedMemory); IWineD3DDevice_Release((IWineD3DDevice *)This->resource.wineD3DDevice); Index: dlls/wined3d/vertexbuffer.c =================================================================== RCS file: /home/wine/wine/dlls/wined3d/vertexbuffer.c,v retrieving revision 1.6 diff -u -r1.6 vertexbuffer.c --- dlls/wined3d/vertexbuffer.c 9 Jan 2005 17:37:02 -0000 1.6 +++ dlls/wined3d/vertexbuffer.c 13 Jan 2005 14:13:35 -0000 @@ -38,16 +38,16 @@ ULONG WINAPI IWineD3DVertexBufferImpl_AddRef(IWineD3DVertexBuffer *iface) { IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; - TRACE("(%p) : AddRef increasing from %ld\n", This, This->resource.ref); + ULONG ref = InterlockedIncrement(&This->resource.ref); + TRACE("(%p) : AddRef increasing from %ld\n", This, ref - 1); IUnknown_AddRef(This->resource.parent); - return InterlockedIncrement(&This->resource.ref); + return ref; } ULONG WINAPI IWineD3DVertexBufferImpl_Release(IWineD3DVertexBuffer *iface) { IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; - ULONG ref; - TRACE("(%p) : Releasing from %ld\n", This, This->resource.ref); - ref = InterlockedDecrement(&This->resource.ref); + ULONG ref = InterlockedDecrement(&This->resource.ref); + TRACE("(%p) : Releasing from %ld\n", This, ref + 1); if (ref == 0) { HeapFree(GetProcessHeap(), 0, This->allocatedMemory); IWineD3DDevice_Release((IWineD3DDevice *)This->resource.wineD3DDevice);

4 10

Re: [AppDB] new fix for preferences
by Paul van Schayck Jan. 13, 2005

Jan. 13, 2005

Hey, On Thu, 13 Jan 2005 14:43:49 -0500, Chris Morgan <chmorgan(a)charter.net> wrote: > Good job guys. That was a tricky one to figure out. Yes it was (all honor to Tony and Jonathan for finding it). The memory alloc problems were caused by addmsg() calling itself recursively trying to insert a message, failing, and trying to insert a message again (trough query_error()). And those failures were caused because the connection to mysql was changed to use another database (the bugzilla db, hence the failure just after using a bugzilla function). And that was caused because although we defined a different connection resource internally the same handle was used (as descriped by the PHP manual) Now we are reselecting the database with each call to the query functions. This is still not completely a clean solution. As this will send an additional query to mysql with each query. I will try something with Tony tomorrow to get it completely clean. We also need to protect addmsg calling itself recursively. I was thinking of checking if it send out the same message already and if so exit;. Another solution would be to not use quer_appdb() but just mysql_query(). What do you think? Paul

1 0

COM inheritance Q
by Ann and Jason Edmeades Jan. 13, 2005

Jan. 13, 2005

Hiya, In the wined3d code I have, for example, a class surface which inherits a lot of methods of Resource. Most of these methods can be called as-is, and I have code which looks like: HRESULT WINAPI IWineD3DSurfaceImpl_GetParent(IWineD3DSurface *iface, IUnknown **pParent) { return IWineD3DResource_GetParent((IWineD3DResource *)iface, pParent); } Great idea.... but this fails: IWineD3DResource_GetParent is a macro: #define IWineD3DSurface_GetParent(p,a) (p)->lpVtbl->GetParent(p,a) So we then go iface->lpVtbl->GetTable. Since iface is a surface, once cast to a resource its GetParent is in the same place in the table... Hence the call ends up being effectively HRESULT WINAPI IWineD3DSurfaceImpl_GetParent(IWineD3DSurface *iface, IUnknown **pParent) { return IWineD3DSurfaceImpl_GetParent (iface, pParent); } Whats the solution? In d3d8 I would have coded IWineD3DSurfaceImpl_GetParent as IWineD3DResourceImpl_GetParent(iface, pParent) because the Impl versions were prototyped - Is this the only way to solve this? Jason

4 10

heapalloc woes..
by Oliver Stieber Jan. 13, 2005

Jan. 13, 2005

Hi, I've been doing some DirectX work with Jason and have come across a problem? with heapalloc. As soon as my system ram maxes out heapalloc fails, even though Linux is using some ram for cache and only 500k of swap is used. Wine is using <300Mb I ahve 512Mb ram and 512 swap. I've written a small test app using malloc to make sure swap is working and I can allocate well over 700Mb of ram without any problems. Should I be using something other than heapalloc or is this a 'wine' problem? ___________________________________________________________ ALL-NEW Yahoo! Messenger - all new features - even more fun! http://uk.messenger.yahoo.com

1 0

[DPLAYX] Get rid of check for DPSET_REMOTE in dplayx.c
by Paul Vriens Jan. 13, 2005

Jan. 13, 2005

Hi, as DPSET_REMOTE is 0 we cannot check for it, like it's currently done in dplayx.c: if( dwFlags & DPSET_REMOTE ) we have to use some other method. As DPSET_REMOTE and DPSET_LOCAL (which is 1) are mutually exclusive we could do: if (!(dwFlags & DPSET_LOCAL)) { } or if (dwFlags & DPSET_LOCAL) { } else /* DPSET_REMOTE */ { } The attached patch gets rid of the afore mentioned wrong checks. Remember that because of the changes the code-path changes as well. We now get into places where we 'never' went before. Patch is only compile tested and I changed some of the coding-style. Any comment is welcome. (I'm learning). Cheers, Paul.

1 0

Re: [LOSTWAGES] Add janitorial task to avoid using strncpy
by Joris Huizer Jan. 13, 2005

Jan. 13, 2005

Mike McCormack wrote: > ChangeLog: > * Add janitorial task to avoid using strncpy > > > ------------------------------------------------------------------------ > > Index: templates/en/janitorial.template > =================================================================== > RCS file: /home/wine/lostwages/templates/en/janitorial.template,v > retrieving revision 1.61 > diff -u -r1.61 janitorial.template > --- templates/en/janitorial.template 11 Jan 2005 20:33:41 -0000 1.61 > +++ templates/en/janitorial.template 13 Jan 2005 15:15:44 -0000 > @@ -7,6 +7,24 @@ > Janitor's List</a>), and it's high time that we have one too. > What is there to clean up? Well, lots of things! :) > > + <h2>Eliminate uses of strncpy/strncpyW</h2> > + > + <i>strncpy(dst,src,n)</i> has two subtle > + <a href="http://weblogs.asp.net/oldnewthing/archive/2005/01/07.aspx"> > + problems</a>. The first is that it always fills the whole <i>dst</i> > + buffer (<i>n</i> characters). The second is that it doesn't always nul > + terminate the <i>dst</i> buffer that it's filling.<p> > + > + Wine code should avoid the use of strncpy for these reasons, and instead > + use lstrcpyA/W or memcpy. You can use the following command to find > + occurences of strncpy in the Wine source code:<p> > + > + <tt>find . -name \*.c -exec grep strncpy {} \; -ls</tt><p> > + > + The aim is to make sure that we only copy as many bytes as necessary into > + the <i>dst</i> buffer, and always nul terminate the buffer when we > + intended to.<p> > + > <h2>Regedit fixes</h2> > > Regedit lacks a few features. We need to improve regedit to: Couldn't we just make a sane implementation of strncpy, not adding more '\0' characters than necessary and making sure the last character is an '\0'? (untested ofcourse ;)) char *strncpy(char *dst,char *src,int n) { int i; for (i = 0; (dst[i] = src[i]) != '\0' && i < n; i++) ; /* n - 1 is '\0'; ensures the end of the string is '\0' */ dst[n - 1] = '\0'; } Now, something like this would at least save us of replacing all strncpyW, wouldn't it? regards, Joris

5 5