- Wine-Devel - list.winehq.org

where does windows define RTL_RWLOCK?
by Robert Reif Jan. 23, 2005

Jan. 23, 2005

I'm trying to compile wine's direct sound dll on windows and I can't get past this problem. I can't find a windows file that defines RTL_RWLOCK in the PSDK or DDK. Is the structure wine uses compatible with windows?

2 1

Re: [DSOUND] fix memory leak in mixer code
by Robert Reif Jan. 22, 2005

Jan. 22, 2005

Robert Reif wrote: > Fix memory leak in mixer code. > > > Revised to remove unnecessary test before HeapFree. Index: dlls/dsound/dsound.c =================================================================== RCS file: /home/wine/wine/dlls/dsound/dsound.c,v retrieving revision 1.24 diff -u -p -r1.24 dsound.c --- dlls/dsound/dsound.c 7 Dec 2004 14:23:46 -0000 1.24 +++ dlls/dsound/dsound.c 22 Jan 2005 20:52:27 -0000 @@ -301,6 +301,7 @@ static ULONG WINAPI IDirectSoundImpl_Rel if (This->driver) IDsDriver_Release(This->driver); + HeapFree(GetProcessHeap(),0,This->tmp_buffer); RtlDeleteResource(&This->buffer_list_lock); This->mixlock.DebugInfo->Spare[1] = 0; DeleteCriticalSection(&This->mixlock); @@ -809,6 +810,8 @@ HRESULT WINAPI IDirectSoundImpl_Create( pDS->primary = NULL; pDS->speaker_config = DSSPEAKER_STEREO | (DSSPEAKER_GEOMETRY_NARROW << 16); pDS->initialized = FALSE; + pDS->tmp_buffer = NULL; + pDS->tmp_buffer_len = 0; /* 3D listener initial parameters */ pDS->listener = NULL; Index: dlls/dsound/dsound_private.h =================================================================== RCS file: /home/wine/wine/dlls/dsound/dsound_private.h,v retrieving revision 1.24 diff -u -p -r1.24 dsound_private.h --- dlls/dsound/dsound_private.h 7 Sep 2004 19:32:21 -0000 1.24 +++ dlls/dsound/dsound_private.h 22 Jan 2005 20:52:27 -0000 @@ -95,6 +95,8 @@ struct IDirectSoundImpl DSBUFFERDESC dsbd; DWORD speaker_config; BOOL initialized; + LPBYTE tmp_buffer; + DWORD tmp_buffer_len; /* DirectSound3DListener fields */ IDirectSound3DListenerImpl* listener; Index: dlls/dsound/mixer.c =================================================================== RCS file: /home/wine/wine/dlls/dsound/mixer.c,v retrieving revision 1.26 diff -u -p -r1.26 mixer.c --- dlls/dsound/mixer.c 8 Sep 2004 01:37:25 -0000 1.26 +++ dlls/dsound/mixer.c 22 Jan 2005 20:52:27 -0000 @@ -368,20 +368,20 @@ static void DSOUND_MixerVol(IDirectSound } } -static void *tmp_buffer; -static size_t tmp_buffer_len = 0; - -static void *DSOUND_tmpbuffer(size_t len) +static LPBYTE DSOUND_tmpbuffer(IDirectSoundImpl *dsound, DWORD len) { - if (len>tmp_buffer_len) { - void *new_buffer = realloc(tmp_buffer, len); - if (new_buffer) { - tmp_buffer = new_buffer; - tmp_buffer_len = len; + TRACE("(%p,%ld)\n",dsound,len); + + if (len > dsound->tmp_buffer_len) { + if (dsound->tmp_buffer) + dsound->tmp_buffer = HeapReAlloc(GetProcessHeap(), 0, dsound->tmp_buffer, len); + else + dsound->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, len); + + dsound->tmp_buffer_len = len; } - return new_buffer; - } - return tmp_buffer; + + return dsound->tmp_buffer; } static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD fraglen) @@ -407,9 +407,7 @@ static DWORD DSOUND_MixInBuffer(IDirectS return 0; } - /* Been seeing segfaults in malloc() for some reason... */ - TRACE("allocating buffer (size = %d)\n", len); - if ((buf = ibuf = (BYTE *) DSOUND_tmpbuffer(len)) == NULL) + if ((buf = ibuf = DSOUND_tmpbuffer(dsb->dsound, len)) == NULL) return 0; TRACE("MixInBuffer (%p) len = %d, dest = %ld\n", dsb, len, writepos); @@ -518,8 +516,7 @@ static void DSOUND_PhaseCancel(IDirectSo nBlockAlign = dsb->dsound->pwfx->nBlockAlign; len = len / nBlockAlign * nBlockAlign; /* data alignment */ - TRACE("allocating buffer (size = %ld)\n", len); - if ((buf = ibuf = (BYTE *) DSOUND_tmpbuffer(len)) == NULL) + if ((buf = ibuf = DSOUND_tmpbuffer(dsb->dsound, len)) == NULL) return; TRACE("PhaseCancel (%p) len = %ld, dest = %ld\n", dsb, len, writepos);

1 0

Re: [DSOUND] fix memory leak in mixer code
by Mike Hearn Jan. 22, 2005

Jan. 22, 2005

On Sat, 22 Jan 2005 14:46:04 -0500, Robert Reif wrote: > + if (This->tmp_buffer) > + HeapFree(GetProcessHeap(),0,This->tmp_buffer); There's no need for the test here, it's duplicated inside HeapFree. There was a janitorial task to clean this up not that long ago. thanks -mike

1 0

Howto process X11 events async'ly
by Peter Quiring Jan. 22, 2005

Jan. 22, 2005

I'm developing my own library and I'm in the process of porting it over in Linux. I can get X11 to display the graphics and process events, but the only problem I have is with processing events without wasting CPU power. How do you process events without constantly polling? What I've done is create a new thread that will call XNextEvent() which will block if there are no events waiting and this seems to work fine. Except if the main thread wants to use the Window it too will deadlock until XNextEvent() returns an event. I've even tried using XPutBackEvent() to wake-up the other thread, but it looks like X11 is not smart enough to handle this. Looking at Wine source it looks like they too have given up on X11 and do sync themselves. But then how do you know when new events are waiting without constantly polling ????? I've looked thru wine source but can't follow it. Thanks in advance. I've asked this question many times @ linuxforum.com but no one there understands the problem. Peter Quiring

3 2

Wine/Winelib for Visual Basic 6.0 Users?
by Ira Krakow Jan. 22, 2005

Jan. 22, 2005

I'm writing the Winelib part of the book. The main audience is Microsoft Visual C++ 6.0 users. I can define a development environment for both MFC and non-MFC users, since it is well documented already. I was wondering - I'd like to include a section for Visual Basic 6.0 users. Beyond running the .EXEs in Wine, is it possible to use Winelib to convert VB6.0 apps? How does it differ from the VC++ environment? There's a _lot_ of VB6 code out there. Attracting these developers will help the Wine project (and sales of our book) tremendously. Thanks for your input. Ira

3 2

Re: [d3drm] Adds a header, and corrects a typo
by Tom Jan. 22, 2005

Jan. 22, 2005

Ivan Leo Puoti wrote: > Peter Berg Larsen wrote: > >> + * Copyright (C) the Wine project > > > Please use your own name here, Wine is not a legal entity and cat' own > copyright, > just as it can't own a building or a car, so this copyright notice > doesn't make much sense. > If you don't want to use your name use something like "The wine project > authors" Why not just - the line you don't have to give copyright notice if you don't want to. Tom > > Ivan. > > > >

3 2

Updating my address book
by Dustin Jan. 22, 2005

Jan. 22, 2005

Hi I am updating my address book and it would be very helpful if you could click on the link below and enter your contact details for me: http://www.bebo.com/fr2/979448a934523b19214292c927616713d18 I am using a service that keeps contact details current, just update your own contact details and then the changes appear in selected friends address books. When I update my contact details you will see them in your address book. Thank you for helping. Dustin

1 0

cleanup shlfileop.c
by Joris Huizer Jan. 22, 2005

Jan. 22, 2005

Changelog: - use retCode smarter (undoing a few bits of myself) - add file_operation_invalid_handle(), file_operation_on_data(), file_operation_invalid_attr() instead of inline code I put back the line the discussion was about - I thought about it and I probably was not thinking the right way; If there are still problems, please let me know Sending here now as it wasn't applied: is there a problem with it or should I just re-submit ? regards, Joris ? .shlfile.diff.swp ? description-pak ? doc-pak ? shlfile.diff ? thisref.sh ? versions ? wine-current.deb ? wine-working.deb ? dlls/shell32/shlfileop.jh.0.c ? dlls/shell32/shlfileop.jh.c Index: dlls/shell32/shlfileop.c =================================================================== RCS file: /home/wine/wine/dlls/shell32/shlfileop.c,v retrieving revision 1.51 diff -u -p -r1.51 shlfileop.c --- dlls/shell32/shlfileop.c 14 Jan 2005 16:51:14 -0000 1.51 +++ dlls/shell32/shlfileop.c 22 Jan 2005 11:37:59 -0000 @@ -945,6 +945,65 @@ static int file_operation_checkFlags(SHF return 0; } +static int file_operation_invalid_handle(long FuncSwitch, LPWSTR pFromFile, DWORD ToPathAttr, LPWSTR pTempFrom) +{ + BOOL b_Mask = (NULL != StrPBrkW(&pFromFile[1], wWildcardChars)); + if ((FO_DELETE == FuncSwitch) && (b_Mask)) + { + DWORD FromPathAttr; + pFromFile[0] = '\0'; + FromPathAttr = GetFileAttributesW(pTempFrom); + pFromFile[0] = '\\'; + if (IsAttribDir(FromPathAttr)) + { + /* FO_DELETE with mask and without found is valid */ + return 0; + } + } + /* root (without mask) is also not allowed as source, tested in W98 */ + return ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; +} + +static int file_operation_on_data(WIN32_FIND_DATAW *wfd,SHFILEOPSTRUCTW *nFileOp, LPWSTR pFromFile,LPWSTR pToFile) +{ + LPWSTR lpFileName = wfd->cAlternateFileName; + if (!lpFileName[0]) + lpFileName = wfd->cFileName; + if (IsDotDir(lpFileName) || + (IsAttribDir(wfd->dwFileAttributes) && (nFileOp->fFlags & FOF_FILESONLY))) + return 0; /* next name in pTempFrom(dir) */ + SHFileStrCpyCatW(&pToFile[1], lpFileName, NULL); + SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); + return SHFileOperationW (nFileOp); +} + +static int file_operation_invalid_attr(LPWSTR pToFile,LPWSTR pTempTo, BOOL b_ToValid) +{ + DWORD ToPathAttr; + BOOL b_ToInvalidTail; + if (pToFile) + { + b_ToInvalidTail = (NULL != StrPBrkW(&pToFile[1], wWildcardChars)); + pToFile[0] = '\0'; + ToPathAttr = GetFileAttributesW(pTempTo); + if ((ToPathAttr == INVALID_FILE_ATTRIBUTES) && b_ToValid) + { + /* create dir must be here, sample target D:\y\ *.* create with RC=10003 */ + if (SHNotifyCreateDirectoryW(pTempTo, NULL)) + { + return 0x73;/* value unknown */ + } + ToPathAttr = GetFileAttributesW(pTempTo); + } + pToFile[0] = '\\'; + if (b_ToInvalidTail) + { + return 0x10003; + } + } + return 0; +} + /************************************************************************* * SHFileOperationW [SHELL32.@] * @@ -964,7 +1023,6 @@ int WINAPI SHFileOperationW(LPSHFILEOPST LPWSTR pTempTo = NULL; LPWSTR pFromFile; LPWSTR pToFile = NULL; - LPWSTR lpFileName; int retCode = 0; DWORD ToAttr; DWORD ToPathAttr; @@ -986,8 +1044,6 @@ int WINAPI SHFileOperationW(LPSHFILEOPST long FuncSwitch = (nFileOp.wFunc & FO_MASK); long level= nFileOp.wFunc>>4; - int ret; - /* default no error */ nFileOp.fAnyOperationsAborted = FALSE; @@ -1016,10 +1072,9 @@ int WINAPI SHFileOperationW(LPSHFILEOPST * create dir 0 0 0 0 0 0 1 0 */ - ret = file_operation_checkFlags(nFileOp); - if (ret != 0) + retCode = file_operation_checkFlags(nFileOp); + if (retCode) { - retCode = ret; goto shfileop_end; } @@ -1108,20 +1163,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPST hFind = FindFirstFileW(pFrom, &wfd); if (INVALID_HANDLE_VALUE == hFind) { - if ((FO_DELETE == FuncSwitch) && (b_Mask)) - { - DWORD FromPathAttr; - pFromFile[0] = '\0'; - FromPathAttr = GetFileAttributesW(pTempFrom); - pFromFile[0] = '\\'; - if (IsAttribDir(FromPathAttr)) - { - /* FO_DELETE with mask and without found is valid */ - goto shfileop_end; - } - } - /* root (without mask) is also not allowed as source, tested in W98 */ - retCode = ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; + retCode = file_operation_invalid_handle(FuncSwitch,pFromFile,ToPathAttr,pTempFrom); goto shfileop_end; } @@ -1130,13 +1172,8 @@ int WINAPI SHFileOperationW(LPSHFILEOPST /* ??? b_Mask = (!SHFileStrICmpA(&pFromFile[1], &wfd.cFileName[0], HIGH_ADR, HIGH_ADR)); */ if (!pTo) /* FO_DELETE */ { - ret = file_operation_delete(&wfd,nFileOp,pFromFile,pTempFrom,&hFind); - /* if ret is not 0, nFileOp.fAnyOperationsAborted is TRUE */ - if (ret != 0) - { - retCode = ret; - goto shfileop_end; - } + retCode = file_operation_delete(&wfd,nFileOp,pFromFile,pTempFrom,&hFind); + /* if retCode is not 0, nFileOp.fAnyOperationsAborted is TRUE and while loop will end */ continue; } /* FO_DELETE ends, pTo must be always valid from here */ @@ -1202,15 +1239,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPST nFileOp.fFlags = (nFileOp.fFlags | FOF_MULTIDESTFILES); do { - lpFileName = wfd.cAlternateFileName; - if (!lpFileName[0]) - lpFileName = wfd.cFileName; - if (IsDotDir(lpFileName) || - (IsAttribDir(wfd.dwFileAttributes) && (nFileOp.fFlags & FOF_FILESONLY))) - continue; /* next name in pTempFrom(dir) */ - SHFileStrCpyCatW(&pToFile[1], lpFileName, NULL); - SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); - retCode = SHFileOperationW (&nFileOp); + retCode = file_operation_on_data(&wfd,&nFileOp,pFromFile,pToFile); } while(!nFileOp.fAnyOperationsAborted && FindNextFileW(hFind, &wfd)); } FindClose(hFind); @@ -1222,27 +1251,9 @@ int WINAPI SHFileOperationW(LPSHFILEOPST /* only FO_COPY/FO_MOVE without mask, all others are (must be) solved */ if (IsAttribDir(wfd.dwFileAttributes) && (ToAttr == INVALID_FILE_ATTRIBUTES)) { - if (pToFile) - { - pToFile[0] = '\0'; - ToPathAttr = GetFileAttributesW(pTempTo); - if ((ToPathAttr == INVALID_FILE_ATTRIBUTES) && b_ToValid) - { - /* create dir must be here, sample target D:\y\ *.* create with RC=10003 */ - if (SHNotifyCreateDirectoryW(pTempTo, NULL)) - { - retCode = 0x73;/* value unknown */ - goto shfileop_end; - } - ToPathAttr = GetFileAttributesW(pTempTo); - } - pToFile[0] = '\\'; - if (b_ToInvalidTail) - { - retCode = 0x10003; - goto shfileop_end; - } - } + retCode = file_operation_invalid_attr(pToFile,pTempTo,b_ToValid); + if (retCode) + goto shfileop_end; } /* trailing BackSlash is ever removed and pToFile points to BackSlash before */

1 0

Re: janitorial: COM status update
by Tom Jan. 22, 2005

Jan. 22, 2005

James Hawkins wrote: > Hi, > > Changelog > * update the status of the COM janitorial projects > > -- > James Hawkins > > Index: templates/en/janitorial.template > =================================================================== > RCS file: /home/wine/lostwages/templates/en/janitorial.template,v > retrieving revision 1.64 > diff -u -r1.64 janitorial.template > --- templates/en/janitorial.template 19 Jan 2005 16:54:31 -0000 1.64 > +++ templates/en/janitorial.template 21 Jan 2005 23:04:11 -0000 > @@ -70,28 +70,10 @@ > <li>avifil32 : 7 files to check > <li>d3d8 : 12 files to check > <li>d3d9 : 17 files to check > - <li>d3dx8 : 1 files to check > - <li>d3dxof : 1 files to check > - <li>dmband : 3 files to check > - <li class=submitted>dmcompos : 4 files checked I beleive this is the way it should be done (class=submitted) instead of removing completed entries. Tom

2 2

spam
by Tom Jan. 21, 2005

Jan. 21, 2005

Unofficial guide for running eXeem under Linux! http://exeem-linux.solaris.name/index.php And Wine is used ofcourse. Tom

1 0