- wine-devel - winehq.org

Re: wined3d: fix check for P8 render target
by Roderick Colenbrander 23 Dec '07

23 Dec '07

> Hi. > > I think this part of d3dfmt_p8_init_palette has a bug, because it appears > to be > checking that render target is a render target. Incorrectly going into > index_in_alpha codepath here causes this bug: > > http://bugs.winehq.org/show_bug.cgi?id=10797 > > in Aliens vs Predator 1 game - it prefers P8 textures and sets color key > on some > textures for transparency and alpha channel is wrong on such textures in > game. > > --- > dlls/wined3d/surface.c | 7 ++----- > 1 files changed, 2 insertions(+), 5 deletions(-) > > Hi, Unfortunately this patch is not correct and I haven't looked exactly what the real issue is. In short most hardware (except if it has GL_EXT_paletted_texture) doesn't support 8bit textures and most of the time we do 8bit->32bit conversion in software. On hardware that supports fragment shaders we perform the conversion using a shader and this is a lot faster (it is 'free'). The palette is uploaded in d3dfmt_p8_init_palette. So the p8 conversion is done in hardware but in some cases we need to read back the data from the card. The p8 -> 32bit conversion was done behind the back of the game, so the game expects 8bit data back. A palette contains upto 256 entries and each color can appear multiple times in the palette. So the inverse palette lookup doesn't have a 1:1 mapping and this is problematic. The trick we do is to store the 8bit color index in the alpha component of the palette and use this to read back the correct index during the 32bit->8bit conversion. The problem is that most games need alpha and for that reason we only use this 'hack' when the primary render target is using 8bit. In this case you can't be using 3D and only old apps like StarCraft use this. Your game is likely using some p8 textures and is likely suffering from the 32 -> 8bit problem. I haven't check AVP but if this is the real issue there it can't be fixed. It would break other games like GTA4 and others. Regards, Roderick Colenbrander -- Psssst! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen: http://www.gmx.net/de/go/multimessenger?did=10

2 3

Re: bugfix for bug #6994
by Chris Robinson 23 Dec '07

23 Dec '07

On Saturday 22 December 2007 04:43:17 pm Alexei Slepov wrote: > We can't use ordinary backbuffer to render textures, which size is more > than > size of the screen. For example, if the screen size is 800x600, we can't > render background texture, which size is 1024x1024. So, if we are using > backbuffer, we see only part of texture, which size is exactly 800x600. > The only way to make the application working properly is to use pbuffer. This is what the OffscreenRenderMethod option is for. If it's set to backbuffer, wined3d needs to use the backbuffer as well as it can. If you need to use pbuffers, set it to pbuffer (which I believe is the default?). Or if the card supports it, use fbo, which is more flexible (and needed for some of D3D9's capabilities, IIRC).

1 0

Fix build when valgrind header is present but does not define VALGRIND_MAKE_WRITABLE
by Vincent Pelletier 22 Dec '07

22 Dec '07

Fixes gcc error: signal_i386.o: In function `setup_exception': /home/vincent/git/wine/dlls/ntdll/signal_i386.c:940: undefined reference to `VALGRIND_MAKE_WRITABLE' collect2: ld returned 1 exit status Others uses of this constant are already checked this way.

1 0

Re: msi: fix memory leaks on error paths (found by Smatch). [2/2]
by James Hawkins 22 Dec '07

22 Dec '07

On Dec 22, 2007 4:29 AM, Lionel_Debroux <lionel_debroux(a)yahoo.fr> wrote: > "msi_load_summary_properties" and "MsiSourceListAddSourceExW" in > dlls/msi/package.c and dlls/msi/source.c get flagged by Michael > Stefaniuc's unfree-wine.pl script. > > 2007-12-21 Lionel Debroux <lionel_debroux(a)yahoo.fr> > * dlls/msi/package.c, dlls/msi/source.c: > msi: fix memory leaks on error paths (found by Smatch). > if (rc != ERROR_SUCCESS) { + msi_free( package_code ); WARN("Unable to query rev number: %d\n", rc); goto done; } Save a line and move the msi_free a couple lines down to the done: block. + { + msi_free(source); /* This is correct because msi strdupW calls msi_alloc. */ return rc; + } Are you serious? Please take that comment out. Either way the fix isn't really right. All you need is a 'goto done' because you're still leaking the reg handles. -- James Hawkins

1 0

Re: msi: correctly handle return value of msi_realloc. [1/2]
by James Hawkins 22 Dec '07

22 Dec '07

On Dec 22, 2007 4:28 AM, Lionel_Debroux <lionel_debroux(a)yahoo.fr> wrote: > Several functions in dlls/msi/action.c and dlls/msi/database.c use > constructs of the form > ptr = msi_realloc (ptr, newsize); > > In the (admittedly very unlikely) situation where msi_realloc fails, > this leaks, or even faults: > filename = msi_realloc(filename, len * sizeof(WCHAR) + sizeof(szlnk)); > memcpy(filename + len, szlnk, sizeof(szlnk)); > > 2007-12-14 Lionel Debroux <lionel_debroux(a)yahoo.fr> > * dlls/msi/action.c, dlls/msi/database.c: > msi: correctly handle return value of msi_realloc. > - filename = msi_realloc(filename, len * sizeof(WCHAR) + sizeof(szlnk)); + p = msi_realloc(filename, len * sizeof(WCHAR) + sizeof(szlnk)); + if (!p) + { + msi_free(target_folder); + msi_free(filename); + ERR("Not enough memory to grow filename\n"); + goto err; + } + filename = p; Don't add ERRs for out of memory...and you need to return ERROR_OUTOFMEMORY in these cases. -- James Hawkins

1 0

Calls to realloc-type functions in Wine...
by Lionel_Debroux 22 Dec '07

22 Dec '07

Hi everybody, One of the patches I sent on December 9th contained a fix for two constructs of the form ptr = msi_realloc (ptr, newsize); I spotted these constructs while investigating on unrelated "potential leak" entries of Michael Stefaniuc's list of potential issues found by Smatch. It's very unlikely that *realloc fails, but if it does, this leaks some memory (or may fault, if the code is not protected against *realloc returning NULL). Last week, I spotted another construct of that form. That prompted me to make a case-insensitive search of "realloc" in the whole Wine tree. Such a simple search was bound to turn a significant amount of noise (comments, TRACE/WARN, even correct uses of realloc, etc.), but it would also reveal other (probably) incorrect uses of realloc-type functions. The sorted and hand-filtered results of the search I made December 14th are attached. I didn't update the file before writing this mail because it didn't make much sense: this kind of info gets outdated fast. In short: I'd say that in the list, at least a couple hundred calls to realloc-type functions are constructs of the form ptr = [realloc] (..., ptr, ...); And to be safe, all entries on the list would have to be investigated (if nothing else, to check for leaks). Do you think this kind of code be checked and fixed for the Wine 1.0 milestone ? That looks doable, if the usual maintainers of / contributors to each piece of code participate. Regards, Lionel. ./dlls/advapi32/tests/registry.c:55: if ((ret = realloc( list[idx], size ))) list[idx] = ret; ./dlls/atl/atl_ax.c:1065: *pptr = HeapReAlloc( GetProcessHeap(), 0, *pptr, *palloc * sizeof(WORD) ); ./dlls/atl/registrar.c:105: buf->str = HeapReAlloc(GetProcessHeap(), 0, buf->str, buf->alloc*sizeof(WCHAR)); ./dlls/avifil32/acmstream.c:470: This->acmStreamHdr.pbDst = HeapReAlloc(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc, size); ./dlls/avifil32/acmstream.c:573: This->acmStreamHdr.pbDst = HeapReAlloc(GetProcessHeap(), 0, This->acmStreamHdr.pbDst, size); ./dlls/avifil32/api.c:1261: pOptions->lpFormat = HeapReAlloc(GetProcessHeap(), 0, pOptions->lpFormat, size); ./dlls/avifil32/api.c:1862: (lpBuffer = HeapReAlloc(GetProcessHeap(), 0, lpBuffer, cbBuffer *= 2)) != NULL); ./dlls/avifil32/api.c:1931: (lpBuffer = HeapReAlloc(GetProcessHeap(), 0, lpBuffer, cbBuffer *= 2)) != NULL); ./dlls/avifil32/api.c:1977: (lpBuffer = HeapReAlloc(GetProcessHeap(), 0, lpBuffer, cbBuffer *= 2)) != NULL); ./dlls/avifil32/avifile.c:1394: HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->idxFmtChanges, ./dlls/avifil32/avifile.c:1429: This->idxFrames = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->idxFrames, ./dlls/avifil32/avifile.c:2036: This->lpBuffer = HeapReAlloc(GetProcessHeap(), 0, This->lpBuffer, maxSize); ./dlls/avifil32/editstream.c:469: This->pStreams = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->pStreams, ./dlls/avifil32/editstream.c:661: This->pStreams = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->pStreams, n * sizeof(EditStreamTable)); ./dlls/avifil32/editstream.c:750: pEdit->pStreams = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pEdit->pStreams, ./dlls/avifil32/extrachunk.c:116: lp = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, extra->lp, extra->cb + cb); ./dlls/avifil32/extrachunk.c:80: lp = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, extra->lp, extra->cb + size + 2 * sizeof(DWORD)); ./dlls/avifil32/getframe.c:263: This->lpInFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpInFormat, This->cbInBuffer); ./dlls/avifil32/getframe.c:473: This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); ./dlls/avifil32/icmstream.c:530: This->lpbiPrev = HeapReAlloc(GetProcessHeap(), 0, This->lpbiPrev, size); ./dlls/avifil32/icmstream.c:958: This->lpbiPrev = HeapReAlloc(GetProcessHeap(), 0, This->lpbiPrev, size ); ./dlls/browseui/aclmulti.c:169: This->objs = CoTaskMemRealloc(This->objs, sizeof(This->objs[0]) * (This->nObjs+1)); ./dlls/browseui/aclmulti.c:192: This->objs = CoTaskMemRealloc(This->objs, sizeof(This->objs[0]) * This->nObjs); ./dlls/browseui/progressdlg.c:91: *buffer = IMalloc_Realloc(malloc, *buffer, cb); ./dlls/comctl32/comctl32undoc.c:1028: LPSTR ptr = ReAlloc (*lppDest, len*sizeof(CHAR)); ./dlls/comctl32/comctl32undoc.c:96:LPVOID WINAPI ReAlloc (LPVOID lpSrc, DWORD dwSize) ./dlls/comctl32/comctl32undoc.c:990: LPWSTR ptr = ReAlloc (*lppDest, len*sizeof(WCHAR)); ./dlls/comctl32/comctl32undoc.c:99: return LocalReAlloc( lpSrc, dwSize, LMEM_ZEROINIT | LMEM_MOVEABLE ); ./dlls/comctl32/dpa.c:590: lpTemp = HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, hdpa->ptrs, nSize); ./dlls/comctl32/dpa.c:651: lpDest = HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, ./dlls/comctl32/dsa.c:217: lpTemp = ReAlloc (hdsa->pData, nSize); ./dlls/comctl32/dsa.c:270: lpTemp = ReAlloc (hdsa->pData, nSize); ./dlls/comctl32/dsa.c:340: lpDest = ReAlloc (hdsa->pData, nSize); ./dlls/comctl32/header.c:1095: infoPtr->items = ReAlloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); ./dlls/comctl32/header.c:1096: infoPtr->order = ReAlloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); ./dlls/comctl32/header.c:1289: infoPtr->items = ReAlloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); ./dlls/comctl32/header.c:1290: infoPtr->order = ReAlloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); ./dlls/comctl32/propsheet.c:2283: ppi = (PropPageInfo*) ReAlloc(psInfo->proppage, ./dlls/comctl32/rebar.c:1924: infoPtr->bands = ReAlloc(infoPtr->bands, infoPtr->uNumBands * sizeof(REBAR_BAND)); ./dlls/comctl32/rebar.c:2275: infoPtr->bands = ReAlloc(infoPtr->bands, (infoPtr->uNumBands+1) * sizeof(REBAR_BAND)); ./dlls/comctl32/string.c:185: LPSTR ptr = ReAlloc (*lppDest, strlen (lpSrc) + 1); ./dlls/comctl32/string.c:242: LPWSTR ptr = ReAlloc (*lppDest, len * sizeof(WCHAR)); ./dlls/comctl32/syslink.c:760: nbl = ReAlloc(bl, (nBlocks + 1) * sizeof(DOC_TEXTBLOCK)); ./dlls/comctl32/tests/imagelist.c:642: my_is->iml_data = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, my_is->iml_data, my_is->iml_data_size); ./dlls/comctl32/tests/misc.c:140: p = pReAlloc(p, 2); ./dlls/comctl32/tests/misc.c:145: p = pReAlloc(NULL, 2); ./dlls/comctl32/tests/misc.c:27:static PVOID (WINAPI * pReAlloc)(PVOID, LONG); ./dlls/comctl32/tests/misc.c:58: COMCTL32_GET_PROC(72, ReAlloc); ./dlls/comctl32/tests/msg.c:38: msg_seq->sequence = HeapReAlloc(GetProcessHeap(), 0, ./dlls/comctl32/tests/subclass.c:127: sequence = HeapReAlloc( GetProcessHeap(), 0, sequence, sequence_size * sizeof (struct message) ); ./dlls/comctl32/toolbar.c:2836: infoPtr->bitmaps = ReAlloc(infoPtr->bitmaps, (infoPtr->nNumBitmapInfos + 1) * sizeof(TBITMAP_INFO)); ./dlls/comctl32/toolbar.c:2860: infoPtr->buttons = ReAlloc(infoPtr->buttons, sizeof(TBUTTON_INFO)*nNewButtons); ./dlls/comctl32/toolbar.c:2936: infoPtr->strings = ReAlloc(infoPtr->strings, sizeof(LPWSTR)*(infoPtr->nNumStrings+1)); ./dlls/comctl32/toolbar.c:2954: infoPtr->strings = ReAlloc(infoPtr->strings, sizeof(LPWSTR)*(infoPtr->nNumStrings+1)); ./dlls/comctl32/toolbar.c:2990: infoPtr->strings = ReAlloc(infoPtr->strings, sizeof(LPWSTR)*(infoPtr->nNumStrings+1)); ./dlls/comctl32/toolbar.c:3796: infoPtr->buttons = ReAlloc(infoPtr->buttons, sizeof(TBUTTON_INFO) * infoPtr->nNumButtons); ./dlls/comctl32/trackbar.c:1312: infoPtr->tics=ReAlloc( infoPtr->tics, ./dlls/comctl32/trackbar.c:163: infoPtr->tics=ReAlloc (infoPtr->tics, ./dlls/comctl32/treeview.c:1141: newText = ReAlloc(wineItem->pszText, len * sizeof(WCHAR)); ./dlls/comctl32/treeview.c:1161: wineItem->pszText = ReAlloc(wineItem->pszText, ./dlls/comctl32/treeview.c:3802: WCHAR *ptr = ReAlloc(editedItem->pszText, sizeof(WCHAR)*(iLength + 1)); ./dlls/comctl32/treeview.c:769: newText = (LPWSTR)ReAlloc(wineItem->pszText, buflen); ./dlls/comctl32/treeview.c:787: LPWSTR newText = ReAlloc(wineItem->pszText, len); ./dlls/comdlg32/printdlg16.c:475: lppd->hDevMode = GlobalReAlloc16(lppd->hDevMode, ./dlls/comdlg32/printdlg16.c:74: *hmem = GlobalReAlloc16(*hmem, size, GMEM_MOVEABLE); ./dlls/comdlg32/printdlg.c:206: *hmem = GlobalReAlloc(*hmem, size, GMEM_MOVEABLE); ./dlls/comdlg32/printdlg.c:2125: lppd->hDevMode = GlobalReAlloc(lppd->hDevMode, ./dlls/comdlg32/printdlg.c:2283: lppd->hDevMode = GlobalReAlloc(lppd->hDevMode, ./dlls/comdlg32/printdlg.c:249: *hmem = GlobalReAlloc(*hmem, size, GMEM_MOVEABLE); ./dlls/comdlg32/printdlg.c:2643: pda->pdlg.hDevMode = GlobalReAlloc(pda->pdlg.hDevMode, ./dlls/crypt32/cert.c:2030: field->indexes = CryptMemRealloc(field->indexes, ./dlls/crypt32/chain.c:1301: CryptMemRealloc(chain->context.rgpLowerQualityChainContext, ./dlls/crypt32/chain.c:295: chain->rgpElement = CryptMemRealloc(chain->rgpElement, ./dlls/crypt32/decode.c:670: itemSizes = CryptMemRealloc(itemSizes, ./dlls/crypt32/main.c:114:LPVOID WINAPI CryptMemRealloc(LPVOID pv, ULONG cbSize) ./dlls/crypt32/main.c:116: return HeapReAlloc(GetProcessHeap(), 0, pv, cbSize); ./dlls/crypt32/msg.c:1416: msg->msg_data.pbData = CryptMemRealloc(msg->msg_data.pbData, ./dlls/crypt32/msg.c:897: out->rgAttr = CryptMemRealloc(out->rgAttr, ./dlls/crypt32/oid.c:810: ret = CryptMemRealloc(multi, (len + lstrlenW(toAdd) + 1) * ./dlls/crypt32/rootstore.c:79: buffer->data = CryptMemRealloc(buffer->data, new_size); ./dlls/crypt32/serialize.c:97: buf = CryptMemRealloc(buf, propSize); ./dlls/crypt32/str.c:542: keeper->keyName = CryptMemRealloc(keeper->keyName, ./dlls/crypt32/str.c:723: info->rgRDN = CryptMemRealloc(info->rgRDN, ./dlls/crypt32/tests/main.c:203: buf = CryptMemRealloc(NULL, 0); ./dlls/crypt32/tests/main.c:206: buf = CryptMemRealloc(buf, 1); ./dlls/crypt32/tests/msg.c:500: accum->updates = CryptMemRealloc(accum->updates, ./dlls/cryptnet/cryptnet_main.c:549: object.pbData = CryptMemRealloc(object.pbData, ./dlls/d3d8/device.c:1616: convertedDecls = HeapReAlloc(GetProcessHeap(), 0, convertedDecls, ./dlls/d3d8/device.c:50: shader_handle *new_handles = HeapReAlloc(GetProcessHeap(), 0, This->shader_handles, new_size * sizeof(shader_handle)); ./dlls/d3d9/device.c:1136: convertedDecls = HeapReAlloc(GetProcessHeap(), 0, convertedDecls, ./dlls/dbghelp/coff.c:113: HeapReAlloc(GetProcessHeap(), 0, coff_files->files, ./dlls/dbghelp/coff.c:137: HeapReAlloc(GetProcessHeap(), 0, coff_file->entries, ./dlls/dbghelp/dbghelp.c:128: pcs->buffer = HeapReAlloc(GetProcessHeap(), 0, pcs->buffer, size); ./dlls/dbghelp/dbghelp.c:294: pcs->search_path = HeapReAlloc(GetProcessHeap(), 0, pcs->search_path, (len *= 2) * sizeof(WCHAR)); ./dlls/dbghelp/dbghelp.c:295: pcs->search_path = HeapReAlloc(GetProcessHeap(), 0, pcs->search_path, (size + 1) * sizeof(WCHAR)); ./dlls/dbghelp/dbghelp.c:300: pcs->search_path = HeapReAlloc(GetProcessHeap(), 0, pcs->search_path, (size + 1 + len + 1) * sizeof(WCHAR)); ./dlls/dbghelp/dbghelp.c:308: pcs->search_path = HeapReAlloc(GetProcessHeap(), 0, pcs->search_path, (size + 1 + len + 1) * sizeof(WCHAR)); ./dlls/dbghelp/minidump.c:228: dc->module = HeapReAlloc(GetProcessHeap(), 0, dc->module, ./dlls/dbghelp/minidump.c:310: dc->mem = HeapReAlloc(GetProcessHeap(), 0, dc->mem, ./dlls/dbghelp/minidump.c:91: dc->pcs_buffer = HeapReAlloc(GetProcessHeap(), 0, dc->pcs_buffer, ./dlls/dbghelp/msc.c:345: cv_current_module->defined_types = HeapReAlloc(GetProcessHeap(), ./dlls/dbghelp/source.c:87: module->sources = HeapReAlloc(GetProcessHeap(), 0, module->sources, ./dlls/dbghelp/stabs.c:1117: pending->vars = HeapReAlloc(GetProcessHeap(), 0, pending->vars, ./dlls/dbghelp/stabs.c:1232: stabbuff = HeapReAlloc(GetProcessHeap(), 0, stabbuff, stabbufflen); ./dlls/dbghelp/stabs.c:167: include_defs = HeapReAlloc(GetProcessHeap(), 0, include_defs, ./dlls/dbghelp/stabs.c:248: cu_vector = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/dbghelp/stabs.c:267: idef->vector = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/dbghelp/symbol.c:664: module->addr_sorttab = HeapReAlloc(GetProcessHeap(), 0, ./dlls/dbghelp/symbol.c:72: *mask = HeapReAlloc(GetProcessHeap(), 0, *mask, ++(*len)); ./dlls/ddraw/ddraw.c:3394: convertedDecls = HeapReAlloc(GetProcessHeap(), 0, convertedDecls, ./dlls/ddraw/tests/ddrawmodes.c:97: modes = realloc(modes, (modes_size *= 2) * sizeof(DDSURFACEDESC)); ./dlls/dinput/joystick_linuxinput.c:316: HeapReAlloc(GetProcessHeap(), 0, joydevs, (1+have_joydevs) * sizeof(struct JoyDev)); ./dlls/dmusic/dmusic.c:135: else This->ppPorts = HeapReAlloc(GetProcessHeap(), 0, This->ppPorts, sizeof(LPDIRECTMUSICPORT) * This->nrofports); ./dlls/dsound/buffer.c:121: This->dsb->notifies = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/dsound/capture.c:1143: device->pwave = HeapReAlloc(GetProcessHeap(), 0,device->pwave, device->nrofpwaves*sizeof(WAVEHDR)); ./dlls/dsound/capture.c:1423: newbuf = HeapReAlloc(GetProcessHeap(),0,device->buffer,buflen); ./dlls/dsound/capture.c:1468: newbuf = HeapReAlloc(GetProcessHeap(),0,device->buffer,buflen); ./dlls/dsound/capture.c:715: This->dscb->notifies = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/dsound/dsound.c:1808: newbuffers = HeapReAlloc(GetProcessHeap(),0,device->buffers,sizeof(IDirectSoundBufferImpl*)*(device->nrofbuffers+1)); ./dlls/dsound/dsound.c:1850: device->buffers = HeapReAlloc(GetProcessHeap(),0,device->buffers,sizeof(LPDIRECTSOUNDBUFFER8)*device->nrofbuffers); ./dlls/dsound/mixer.c:430: dsb->device->tmp_buffer = HeapReAlloc(GetProcessHeap(), 0, dsb->device->tmp_buffer, len); ./dlls/dsound/primary.c:218: newbuf = HeapReAlloc(GetProcessHeap(),0,device->buffer, buflen); ./dlls/dsound/primary.c:230: headers = HeapReAlloc(GetProcessHeap(),0,device->pwave, device->helfrags * sizeof(WAVEHDR)); ./dlls/dsound/primary.c:465: device->pwfx = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,device->pwfx,alloc_size); ./dlls/dsound/primary.c:537: device->mix_buffer = HeapReAlloc(GetProcessHeap(), 0, device->mix_buffer, device->mix_buffer_len); ./dlls/gdi32/enhmfdrv/init.c:206: emh = HeapReAlloc(GetProcessHeap(), 0, physDev->emh, nEmfSize); ./dlls/gdi32/enhmfdrv/objects.c:44: physDev->handles = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/gdi32/freetype.c:3615: font->gm = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, font->gm, ./dlls/gdi32/freetype.c:5062: font->kern_pairs = HeapReAlloc(GetProcessHeap(), 0, font->kern_pairs, ./dlls/gdi32/freetype.c:664: ret.array = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ret.array, ret.max_size * sizeof(*ret.array)); ./dlls/gdi32/gdiobj.c:697:void *GDI_ReallocObject( WORD size, HGDIOBJ handle, void *object ) ./dlls/gdi32/gdiobj.c:705: new_ptr = HeapReAlloc( GetProcessHeap(), 0, large_handles[i], size ); ./dlls/gdi32/metafile16.c:311: return (HMETAFILE16)GlobalReAlloc16( hMeta, 0, ./dlls/gdi32/metafile.c:200: mh = HeapReAlloc( GetProcessHeap(), 0, mh, size ); ./dlls/gdi32/metafile.c:303: mh = HeapReAlloc( GetProcessHeap(), 0, mh, ./dlls/gdi32/mfdrv/init.c:450: mh = HeapReAlloc( GetProcessHeap(), 0, physDev->mh, size); ./dlls/gdi32/mfdrv/objects.c:48: physDev->handles = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/gdi32/painting.c:1152: *PtsOut = HeapReAlloc( GetProcessHeap(), 0, *PtsOut, ./dlls/gdi32/painting.c:952: line_pts = HeapReAlloc(GetProcessHeap(), 0, line_pts, ./dlls/gdi32/palette.c:379: if (!(palPtr = GDI_ReallocObject( size, hPal, palPtr ))) return FALSE; ./dlls/gdi32/path.c:1797: pLinePts = HeapReAlloc(GetProcessHeap(), 0, pLinePts, ./dlls/gdi32/path.c:1935: pStrokes = HeapReAlloc(GetProcessHeap(), 0, pStrokes, numStrokes * sizeof(GdiPath*)); ./dlls/gdi32/region.c:1381: if (! (dst->rects = HeapReAlloc( GetProcessHeap(), 0, dst->rects, ./dlls/gdi32/region.c:151: *firstrect = HeapReAlloc( GetProcessHeap(), 0, *firstrect, (2 * (sizeof(RECT)) * (reg->size))); ./dlls/gdi32/region.c:1807: newReg->rects = HeapReAlloc( GetProcessHeap(), 0, newReg->rects, ./dlls/gdi32/region.c:2670: if (!(reg->rects = HeapReAlloc( GetProcessHeap(), 0, reg->rects, ./dlls/gdiplus/graphicspath.c:57: path->pathdata.Points = HeapReAlloc(GetProcessHeap(), 0, ./dlls/gdiplus/graphicspath.c:61: path->pathdata.Types = HeapReAlloc(GetProcessHeap(), 0, ./dlls/hhctrl.ocx/chm.c:109: buf = heap_realloc(buf, buf_size=entry.len); ./dlls/hhctrl.ocx/chm.c:42: chm->strings = heap_realloc_zero(chm->strings, ./dlls/hhctrl.ocx/content.c:80: buf->buf = heap_realloc(buf->buf, buf->size); ./dlls/hlink/hlink_main.c:297: buf = CoTaskMemRealloc(buf, size); ./dlls/imm32/imm.c:1969: newone = HeapReAlloc(GetProcessHeap(), 0, internal, real_size); ./dlls/inetcomm/mimeole.c:153: buf = HeapReAlloc(GetProcessHeap(), 0, buf, size + 1); ./dlls/kernel32/computername.c:89: extrabuf = HeapReAlloc( GetProcessHeap(), 0, extrabuf, ebufsize ) ; ./dlls/kernel32/editline.c:155: newline = HeapReAlloc(GetProcessHeap(), 0, ctx->line, sizeof(WCHAR) * newsize); ./dlls/kernel32/error16.c:129: ErrorString(ERR_GREALLOC), ./dlls/kernel32/error16.c:132: ErrorString(ERR_LREALLOC), ./dlls/kernel32/error16.c:92:#define ERR_GREALLOC 0x0002 ./dlls/kernel32/error16.c:95:#define ERR_LREALLOC 0x0005 ./dlls/kernel32/format_msg.c:191: target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2);\ ./dlls/kernel32/format_msg.c:330: target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize); ./dlls/kernel32/format_msg.c:411: target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2*sizeof(WCHAR));\ ./dlls/kernel32/format_msg.c:546: target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize*sizeof(WCHAR)); ./dlls/kernel32/global16.c:116: GLOBALARENA *pNewArena = realloc( pGlobalArena, ./dlls/kernel32/global16.c:222: SELECTOR_ReallocBlock( sel, ptr, size ); ./dlls/kernel32/global16.c:296:HGLOBAL16 WINAPI GlobalReAlloc16( ./dlls/kernel32/global16.c:336: SELECTOR_ReallocBlock( sel, 0, 1 ); ./dlls/kernel32/global16.c:388: newptr = HeapReAlloc( heap, ./dlls/kernel32/global16.c:389: (pArena->pageLockCount > 0) ? HEAP_REALLOC_IN_PLACE_ONLY : 0, ./dlls/kernel32/global16.c:414: sel = SELECTOR_ReallocBlock( sel, ptr, size ); ./dlls/kernel32/heap.c:1064:HLOCAL WINAPI LocalReAlloc( ./dlls/kernel32/heap.c:1069: return (HLOCAL)GlobalReAlloc( (HGLOBAL)handle, size, flags ); ./dlls/kernel32/heap.c:284:LPVOID WINAPI HeapReAlloc( HANDLE heap, DWORD flags, LPVOID ptr, SIZE_T size ) ./dlls/kernel32/heap.c:286: return RtlReAllocateHeap( heap, flags, ptr, size ); ./dlls/kernel32/heap.c:596:HGLOBAL WINAPI GlobalReAlloc( ./dlls/kernel32/heap.c:649: hnew=HeapReAlloc(GetProcessHeap(), heap_flags, hmem, size); ./dlls/kernel32/heap.c:674: else if((palloc = HeapReAlloc(GetProcessHeap(), heap_flags, ./dlls/kernel32/lcformat.c:1910: buf = HeapReAlloc(GetProcessHeap(), 0, buf, bufSz); ./dlls/kernel32/local16.c:1206:HLOCAL16 WINAPI LocalReAlloc16( HLOCAL16 handle, WORD size, UINT16 flags ) ./dlls/kernel32/local16.c:1408: if (size == oldsize) hmem = 0; /* Realloc failed */ ./dlls/kernel32/local16.c:2037:DWORD WINAPI Local32ReAlloc16( HANDLE heap, DWORD addr, INT16 type, ./dlls/kernel32/local16.c:2052: ptr = HeapReAlloc( header->heap, ./dlls/kernel32/local16.c:524: hseg = GlobalReAlloc16( hseg, 0x10000, GMEM_FIXED ); ./dlls/kernel32/module.c:781: if (!(new_ptr = HeapReAlloc( GetProcessHeap(), 0, ret, path_len + len * sizeof(WCHAR) ))) ./dlls/kernel32/ne_segment.c:853: newModule = HeapReAlloc( GetProcessHeap(), 0, ./dlls/kernel32/resource16.c:100: newElem = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/kernel32/resource16.c:344: handle = GlobalReAlloc16( hMemObj, pNameInfo->length << sizeShift, 0 ); ./dlls/kernel32/selector.c:163:WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size ) ./dlls/kernel32/selector.c:173: sel = wine_ldt_realloc_entries( sel, oldcount, newcount ); ./dlls/kernel32/snoop16.c:147: *dll = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *dll, sizeof(SNOOP16_DLL)+strlen(name)); ./dlls/kernel32/tests/alloc.c:112: mem2a=HeapReAlloc(heap,HEAP_ZERO_MEMORY,mem2,memchunk+5*sysInfo.dwPageSize); ./dlls/kernel32/tests/alloc.c:127: mem1a=HeapReAlloc(heap,HEAP_REALLOC_IN_PLACE_ONLY,mem1,memchunk+sysInfo.dwPageSize); ./dlls/kernel32/tests/alloc.c:208: mem2a=GlobalReAlloc(mem2,0,GMEM_MODIFY | GMEM_MOVEABLE); ./dlls/kernel32/tests/alloc.c:217: mem2a=GlobalReAlloc(mem2,2*memchunk,GMEM_MOVEABLE | GMEM_ZEROINIT); ./dlls/kernel32/tests/alloc.c:309: mem2a=LocalReAlloc(mem2,2*memchunk,LMEM_MOVEABLE | LMEM_ZEROINIT); ./dlls/kernel32/tests/heap.c:212: gbl = LocalReAlloc(gbl, 10, LMEM_MOVEABLE); ./dlls/kernel32/tests/heap.c:217: gbl = LocalReAlloc(gbl, 0, LMEM_MOVEABLE); ./dlls/kernel32/tests/heap.c:226: gbl = LocalReAlloc(0, 10, LMEM_MOVEABLE); ./dlls/kernel32/tests/heap.c:51: mem = HeapReAlloc(GetProcessHeap(), 0, NULL, 10); ./dlls/kernel32/tests/heap.c:67: msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~0UL - 7); ./dlls/kernel32/tests/heap.c:69: msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~0UL); ./dlls/kernel32/tests/heap.c:79: gbl = GlobalReAlloc(gbl, 10, GMEM_MOVEABLE); ./dlls/kernel32/tests/heap.c:84: gbl = GlobalReAlloc(gbl, 0, GMEM_MOVEABLE); ./dlls/kernel32/tests/heap.c:93: gbl = GlobalReAlloc(0, 10, GMEM_MOVEABLE); ./dlls/kernel32/toolhelp16.c:113: notifys=HeapReAlloc( GetProcessHeap(), 0, notifys, ./dlls/kernel32/toolhelp16.c:87: notifys=HeapReAlloc( GetProcessHeap(), 0, notifys, ./dlls/kernel32/toolhelp.c:114: *ldr_mod = HeapReAlloc( GetProcessHeap(), 0, *ldr_mod, ./dlls/kernel32/toolhelp.c:208: *pspi = HeapReAlloc( GetProcessHeap(), 0, *pspi, size *= 2 ); ./dlls/mapi32/imalloc.c:122:static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb) ./dlls/mapi32/imalloc.c:130: return LocalReAlloc((HANDLE) pv, cb, LMEM_MOVEABLE); ./dlls/mapi32/imalloc.c:177: IMAPIMalloc_fnRealloc, ./dlls/mciavi32/mmoutput.c:238: wma->lpAudioIndex = HeapReAlloc(GetProcessHeap(), 0, wma->lpAudioIndex, ./dlls/mlang/mlang.c:1849: data->info = HeapReAlloc(GetProcessHeap(), 0, data->info, data->allocated * sizeof(RFC1766INFO)); ./dlls/mpr/mpr_main.c:47:LPVOID WINAPI MPR_ReAlloc( LPVOID lpSrc, DWORD dwSize ) ./dlls/mpr/mpr_main.c:50: return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, lpSrc, dwSize ); ./dlls/mscms/profile.c:691: char **tmp = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/mscms/profile.c:819: WCHAR **tmp = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/mshtml/conpoint.c:155: This->sinks = heap_realloc(This->sinks,(++This->sinks_size)*sizeof(*This->sinks)); ./dlls/mshtml/htmlelem.c:53: buf->buf = heap_realloc(buf->buf, buf->size*sizeof(HTMLElement**)); ./dlls/mshtml/htmlelem.c:65: buf->buf = heap_realloc(buf->buf, buf->len*sizeof(HTMLElement**)); ./dlls/mshtml/install.c:235: file_name = heap_realloc(file_name, size+sizeof(GECKO_FILE_NAME)); ./dlls/mshtml/navigate.c:753: headers = heap_realloc(headers,(headers_len+len+1)*sizeof(WCHAR)); ./dlls/mshtml/navigate.c:776: post_data = GlobalReAlloc(post_data, post_data_len+1, 0); ./dlls/mshtml/txtrange.c:177: buf->buf = heap_realloc(buf->buf, buf->size * sizeof(WCHAR)); ./dlls/mshtml/txtrange.c:199: buf->buf = heap_realloc(buf->buf, buf->size * sizeof(WCHAR)); ./dlls/msi/action.c:3128: filename = msi_realloc(filename, len * sizeof(WCHAR) + sizeof(szlnk)); ./dlls/msi/action.c:4510: vector = msi_realloc(vector, (*numargs + 1) * sizeof(LPWSTR)); ./dlls/msi/action.c:5208: file->dest = msi_realloc(file->dest, size * sizeof(WCHAR)); ./dlls/msi/database.c:416: columns = msi_realloc(columns, sql_size * sizeof(WCHAR)); ./dlls/msi/database.c:543: columns = msi_realloc(columns, sql_size * sizeof(WCHAR)); ./dlls/msi/database.c:589: temp_columns = msi_realloc(columns, sql_size * sizeof(WCHAR)); ./dlls/msi/database.c:700: temp_records = msi_realloc(records, (num_records + 1) * sizeof(LPWSTR *)); ./dlls/msi/database.c:807: char *p = msi_realloc( buffer, sz + 1 ); ./dlls/msi/dialog.c:1534: buf = msi_realloc( buf, sz*sizeof(WCHAR) ); ./dlls/msi/files.c:525: src = msi_realloc(src, (lstrlenW(src) + lstrlenW(ptr)) * sizeof(WCHAR)); ./dlls/msi/format.c:478: nd2 = msi_realloc(newdata,(size+chunk)); ./dlls/msi/format.c:498: tgt = msi_realloc(newdata,size); ./dlls/msi/format.c:591: nd2= msi_realloc(newdata,(size + chunk)); ./dlls/msi/format.c:82: buf = msi_realloc(buf, (max_len + 1) * sizeof(WCHAR)); ./dlls/msi/format.c:98: rc = msi_realloc(rc, size * sizeof(WCHAR)); ./dlls/msi/handle.c:96: p = msi_realloc_zero(msihandletable, ./dlls/msi/helpers.c:403: newbuf = msi_realloc( package->script->Actions[script], ./dlls/msi/helpers.c:977: newbuf = msi_realloc( package->script->UniqueActions, ./dlls/msi/package.c:1092: message = msi_realloc(message,total_size*sizeof (WCHAR)); ./dlls/msi/sql.tab.c:2519: list = msi_realloc(list, size * sizeof(WCHAR)); ./dlls/msi/sql.y:686: list = msi_realloc(list, size * sizeof(WCHAR)); ./dlls/msi/streams.c:62: sv->streams = msi_realloc(sv->streams, sv->max_streams * sizeof(STREAM *)); ./dlls/msi/string.c:146: p = msi_realloc_zero( st->strings, sz*sizeof(msistring) ); ./dlls/msi/table.c:1057: table->data[n] = msi_realloc( table->data[n], size ); ./dlls/msi/table.c:1394: p = msi_realloc( *data_ptr, sz ); ./dlls/msvcrt/data.c:114: wblk = HeapReAlloc( GetProcessHeap(), 0, wblk, count* sizeof(MSVCRT_wchar_t*) + len * sizeof(MSVCRT_wchar_t)); ./dlls/msvcrt/data.c:82: blk = HeapReAlloc( GetProcessHeap(), 0, blk, count* sizeof(char*) + len ); ./dlls/msvcrt/exit.c:82: tmp = MSVCRT_realloc(*start, len * sizeof(tmp)); ./dlls/msvcrt/heap.c:146: return HeapReAlloc(GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, mem, size); ./dlls/msvcrt/heap.c:293: if (size) return HeapReAlloc(GetProcessHeap(), 0, ptr, size); ./dlls/msvcrt/heap.c:455: temp = MSVCRT_realloc(*saved, size + alignment + sizeof(void *)); ./dlls/msvcrt/tests/heap.c:123: mem2 = p_aligned_realloc(mem, size2, alignment); ./dlls/msvcrt/tests/heap.c:195: mem2 = p_aligned_offset_realloc(mem, size2, alignment, offset); ./dlls/msvcrt/tests/heap.c:425: mem = realloc(NULL, 10); ./dlls/msvcrt/tests/heap.c:428: mem = realloc(mem, 20); ./dlls/msvcrt/tests/heap.c:431: mem = realloc(mem, 0); ./dlls/msvcrt/tests/heap.c:434: mem = realloc(NULL, 0); ./dlls/msvcrt/tests/heap.c:91:static void test_aligned_realloc(size_t size1, size_t size2, size_t alignment) ./dlls/netapi32/apibuf.c:61:NET_API_STATUS WINAPI NetApiBufferReallocate(LPVOID OldBuffer, DWORD NewByteCount, ./dlls/netapi32/apibuf.c:68: *NewBuffer = HeapReAlloc(GetProcessHeap(), 0, OldBuffer, NewByteCount); ./dlls/netapi32/netbios.c:436: newSessions = HeapReAlloc(GetProcessHeap(), ./dlls/netapi32/netbios.c:87: gNBTable.table = HeapReAlloc(GetProcessHeap(), ./dlls/netapi32/tests/apibuf.c:101: if (pNetApiBufferAllocate && pNetApiBufferFree && pNetApiBufferReallocate && pNetApiBufferSize) ./dlls/netapi32/tests/apibuf.c:34:static NET_API_STATUS (WINAPI *pNetApiBufferReallocate)(LPVOID,DWORD,LPVOID*)=NULL; ./dlls/netapi32/tests/apibuf.c:50: ok(pNetApiBufferReallocate(p, 1500, (LPVOID *) &p) == NERR_Success, ./dlls/netapi32/tests/apibuf.c:64: ok(pNetApiBufferReallocate(0, 1500, (LPVOID *) &p) == NERR_Success, "Reallocate with OldBuffer = NULL failed\n"); ./dlls/netapi32/tests/apibuf.c:67: ok(pNetApiBufferReallocate(p, 0, (LPVOID *) &p) == NERR_Success, "Not freed\n"); ./dlls/netapi32/wksta.c:333: NetApiBufferReallocate( ./dlls/netapi32/wksta.c:445: NetApiBufferReallocate( ./dlls/ntdll/actctx.c:1906: if (!(path = RtlReAllocateHeap( GetProcessHeap(), 0, path_us.Buffer, ./dlls/ntdll/actctx.c:292: ptr = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/ntdll/actctx.c:319: ptr = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/ntdll/actctx.c:353: ptr = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/ntdll/actctx.c:467: ptr = RtlReAllocateHeap(GetProcessHeap(), 0, acl->dependencies, ./dlls/ntdll/directory.c:2025: if (!(new_name = RtlReAllocateHeap( GetProcessHeap(), 0, unix_name, unix_len ))) ./dlls/ntdll/heap.c:1313:PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size ) ./dlls/ntdll/loadorder.c:178: env_list.order = RtlReAllocateHeap(GetProcessHeap(), 0, env_list.order, ./dlls/ntdll/nt.c:291: buffer = RtlReAllocateHeap(GetProcessHeap(), 0, buffer, reply->user_len); ./dlls/ntdll/path.c:1044: if (!(newcwd = RtlReAllocateHeap( GetProcessHeap(), 0, cwd, size ))) ./dlls/ntdll/path.c:469: WCHAR *newname = RtlReAllocateHeap(GetProcessHeap(), 0, name, ./dlls/ntdll/relay.c:671: *dll = RtlReAllocateHeap(GetProcessHeap(), ./dlls/ntdll/tests/info.c:256: spi = HeapReAlloc(GetProcessHeap(), 0, spi , SystemInformationLength *= 2); ./dlls/ntdll/tests/info.c:356: sppi = HeapReAlloc(GetProcessHeap(), 0, sppi , NeededLength + 2); ./dlls/ntdll/tests/info.c:380: smi = HeapReAlloc(GetProcessHeap(), 0, smi , SystemInformationLength); ./dlls/ntdll/tests/info.c:417: shi = HeapReAlloc(GetProcessHeap(), 0, shi , SystemInformationLength); ./dlls/ntdll/tests/reg.c:100:static NTSTATUS (WINAPI * pRtlReAllocateHeap)(IN PVOID, IN ULONG, IN PVOID, IN ULONG); ./dlls/ntdll/tests/reg.c:144: NTDLL_GET_PROC(RtlReAllocateHeap) ./dlls/ntdll/tests/reg.c:466: winetestpath.Buffer = (PWSTR)pRtlReAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, winetestpath.Buffer, ./dlls/ole32/bindctx.c:483: This->bindCtxTable = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,This->bindCtxTable, ./dlls/ole32/compositemoniker.c:1143: *ppszDisplayName=CoTaskMemRealloc(*ppszDisplayName,lengthStr * sizeof(WCHAR)); ./dlls/ole32/compositemoniker.c:1465: This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); ./dlls/ole32/compositemoniker.c:1819: This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); ./dlls/ole32/compositemoniker.c:1873: This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); ./dlls/ole32/compositemoniker.c:1916: This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); ./dlls/ole32/compositemoniker.c:249: This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); ./dlls/ole32/filemoniker.c:1388: This->filePathName=HeapReAlloc(GetProcessHeap(),0,This->filePathName,(sizeStr+1)*sizeof(WCHAR)); ./dlls/ole32/hglobalstream.c:436: supportHandle = GlobalReAlloc(This->supportHandle, libNewSize.u.LowPart, 0); ./dlls/ole32/ifs.c:177: preAllocResult = IMallocSpy_PreAlloc(Malloc32.pSpy, cb); ./dlls/ole32/ifs.c:201:static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) { ./dlls/ole32/ifs.c:213: cb = IMallocSpy_PreRealloc(Malloc32.pSpy, pv, cb, &pRealMemory, fSpyed); ./dlls/ole32/ifs.c:231: else if (cb) pNewMemory = HeapReAlloc(GetProcessHeap(),0,pv,cb); ./dlls/ole32/ifs.c:238: pNewMemory = IMallocSpy_PostRealloc(Malloc32.pSpy, pNewMemory, TRUE); ./dlls/ole32/ifs.c:426:static ULONG WINAPI IMallocSpy_fnPreAlloc(LPMALLOCSPY iface, ULONG cbRequest) ./dlls/ole32/ifs.c:451:static ULONG WINAPI IMallocSpy_fnPreRealloc(LPMALLOCSPY iface, void* pRequest, ULONG cbRequest, void** ppNewRequest, BOOL fSpyed) ./dlls/ole32/ifs.c:459:static PVOID WINAPI IMallocSpy_fnPostRealloc(LPMALLOCSPY iface, void* pActual, BOOL fSpyed) ./dlls/ole32/ifs.c:594:LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, ULONG size) ./dlls/ole32/ifs.c:596: return IMalloc_Realloc((LPMALLOC)&Malloc32, pvOld, size); ./dlls/ole32/ifs.c:81: else NewSpyedBlocks = LocalReAlloc(Malloc32.SpyedBlocks, NewLength * sizeof(PVOID), LMEM_ZEROINIT); ./dlls/ole32/itemmoniker.c:291: This->itemDelimiter=HeapReAlloc(GetProcessHeap(),0,This->itemDelimiter,lenW*sizeof(WCHAR)); ./dlls/ole32/itemmoniker.c:316: This->itemName=HeapReAlloc(GetProcessHeap(),0,This->itemName,lenW*sizeof(WCHAR)); ./dlls/ole32/memlockbytes16.c:355: supportHandle = GlobalReAlloc16(This->supportHandle, libNewSize.u.LowPart, 0); ./dlls/ole32/memlockbytes.c:518: supportHandle = GlobalReAlloc(This->supportHandle, libNewSize.u.LowPart, 0); ./dlls/ole32/ole16.c:126:SEGPTR CDECL IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb) ./dlls/ole32/ole16.c:134: ret = MapLS( HeapReAlloc( GetProcessHeap(), 0, MapSL(pv), cb ) ); ./dlls/ole32/ole16.c:190: VTENT(Realloc); ./dlls/ole32/oleobj.c:341: This->arrayOfSinks = HeapReAlloc(GetProcessHeap(), ./dlls/ole32/oleobj.c:718: This->Connections = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/ole32/storage32.c:4094: This->stackToVisit = HeapReAlloc( ./dlls/oleaut32/connpt.c:276: This->sinks = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->sinks, ./dlls/oleaut32/ole2disp.c:112:INT16 WINAPI SysReAllocString16(LPBSTR16 pbstr,LPCOLESTR16 oleStr) ./dlls/oleaut32/ole2disp.c:174:int WINAPI SysReAllocStringLen16(BSTR16 *old,const char *in,int len) ./dlls/oleaut32/oleaut.c:292:int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) ./dlls/oleaut32/oleaut.c:300: DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,newbytelen+sizeof(WCHAR)+sizeof(DWORD)); ./dlls/oleaut32/oleaut.c:411:INT WINAPI SysReAllocString(LPBSTR old,LPCOLESTR str) ./dlls/oleaut32/olefont.c:474: this->description.lpstrName = HeapReAlloc(GetProcessHeap(), ./dlls/oleaut32/olepicture.c:1850: xbuf = HeapReAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, xbuf, origsize); ./dlls/oleaut32/olepicture.c:2094: pIconData = HeapReAlloc(GetProcessHeap(), 0, pIconData, iDataSize); ./dlls/oleaut32/tests/olepicture.c:653: supportHandle = GlobalReAlloc(This->supportHandle, libNewSize.u.LowPart, 0); ./dlls/oleaut32/tests/tmarshal.c:45: if ((ret = realloc( list[idx], size ))) list[idx] = ret; ./dlls/oleaut32/tests/vartype.c:5121:static void test_SysReAllocString(void) ./dlls/oleaut32/tests/vartype.c:5140: changed = SysReAllocString(&str, szSmaller); ./dlls/oleaut32/tests/vartype.c:5148: changed = SysReAllocString(&str, szLarger); ./dlls/oleaut32/tests/vartype.c:5160:static void test_SysReAllocStringLen(void) ./dlls/oleaut32/tests/vartype.c:5179: changed = SysReAllocStringLen(&str, szSmaller, 1); ./dlls/oleaut32/tests/vartype.c:5187: changed = SysReAllocStringLen(&str, szLarger, 6); ./dlls/oleaut32/tests/vartype.c:5195: changed = SysReAllocStringLen(&str, str, 6); ./dlls/oleaut32/tests/vartype.c:6052: test_SysReAllocString(); ./dlls/oleaut32/tests/vartype.c:6053: test_SysReAllocStringLen(); ./dlls/oleaut32/tmarshal.c:1421: buf.base = HeapReAlloc(GetProcessHeap(),0,buf.base,msg.cbBuffer); ./dlls/oleaut32/tmarshal.c:84: buf->base = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buf->base, newsize); ./dlls/oleaut32/typelib2.c:460: block = HeapReAlloc(GetProcessHeap(), 0, This->typelib_segment_data[segment], block_size << 1); ./dlls/oleaut32/ungif.c:202: New->ExtensionBlocks = ungif_realloc(New->ExtensionBlocks, ./dlls/oleaut32/ungif.c:395: if ((GifFile->SavedImages = ungif_realloc(GifFile->SavedImages, ./dlls/oleaut32/ungif.c:68:static void *ungif_realloc( void *ptr, size_t sz ) ./dlls/oleaut32/ungif.c:70: return HeapReAlloc( GetProcessHeap(), 0, ptr, sz ); ./dlls/quartz/filtergraph.c:100: omr->messages = HeapReAlloc(GetProcessHeap(),0,omr->messages, omr->ring_buffer_size * sizeof(Event)); ./dlls/riched20/clipboard.c:360: pData->hData = GlobalReAlloc(pData->hData, nNewSize, 0); ./dlls/riched20/clipboard.c:382: GlobalReAlloc(gds.hData, gds.nLength+1, 0); ./dlls/riched20/reader.c:2293: rtfHashTable[index].value = heap_realloc(rtfHashTable[index].value, sizeof(RTFKey *) * (rtfHashTable[index].count + 1)); ./dlls/riched20/reader.c:2710: info->cpOutputBuffer = heap_realloc(info->cpOutputBuffer, info->dwMaxCPOutputCount); ./dlls/rpcrt4/ndr_fullpointer.c:87: HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/rpcrt4/ndr_fullpointer.c:91: HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/rpcrt4/rpc_binding.c:331: LPSTR ndst = HeapReAlloc(GetProcessHeap(), 0, dst, (len+slen+2)*sizeof(CHAR)); ./dlls/rpcrt4/rpc_binding.c:345: LPWSTR ndst = HeapReAlloc(GetProcessHeap(), 0, dst, (len+slen+2)*sizeof(WCHAR)); ./dlls/rpcrt4/rpc_message.c:59:static RPC_STATUS I_RpcReAllocateBuffer(PRPC_MESSAGE pMsg); ./dlls/rpcrt4/rpc_message.c:800: status = I_RpcReAllocateBuffer(pMsg); ./dlls/rpcrt4/rpc_message.c:929:static RPC_STATUS I_RpcReAllocateBuffer(PRPC_MESSAGE pMsg) ./dlls/rpcrt4/rpc_message.c:932: pMsg->Buffer = HeapReAlloc(GetProcessHeap(), 0, pMsg->Buffer, pMsg->BufferLength); ./dlls/rpcrt4/rpc_transport.c:1241: poll_info = HeapReAlloc(GetProcessHeap(), 0, poll_info, *count*sizeof(*poll_info)); ./dlls/rpcrt4/rpc_transport.c:570: objs = HeapReAlloc(GetProcessHeap(), 0, objs, *count*sizeof(HANDLE)); ./dlls/rsaenh/mpi.c:1953: tmp = realloc (a->dp, sizeof (mp_digit) * size); ./dlls/rsaenh/mpi.c:3612: if ((tmp = realloc (a->dp, sizeof (mp_digit) * a->used)) == NULL) { ./dlls/sane.ds/ui.c:290: rc = HeapReAlloc(GetProcessHeap(),0,lead_static,leading_len+local_len + padding); ./dlls/sane.ds/ui.c:350: rc = HeapReAlloc(GetProcessHeap(),0,rc,leading_len+local_len + padding ./dlls/sane.ds/ui.c:434: newone = HeapReAlloc(GetProcessHeap(),0,all_controls, ./dlls/secur32/dispatcher.c:152: char *buf = HeapReAlloc(GetProcessHeap(), 0, helper->com_buf, ./dlls/setupapi/devinst.c:313: iface->instances = HeapReAlloc(GetProcessHeap(), 0, ./dlls/setupapi/devinst.c:542: set->devices = HeapReAlloc(GetProcessHeap(), 0, set->devices, ./dlls/setupapi/dirid.c:213: new = HeapReAlloc( GetProcessHeap(), 0, user_dirids, ./dlls/setupapi/install.c:597: if (!(p = HeapReAlloc( GetProcessHeap(), 0, path, ./dlls/setupapi/install.c:646: if (!(p = HeapReAlloc( GetProcessHeap(), 0, path, ./dlls/setupapi/misc.c:101: return HeapReAlloc(GetProcessHeap(), 0, lpSrc, dwSize); ./dlls/setupapi/misc.c:811: SecDesc = (PSECURITY_DESCRIPTOR)MyRealloc(SecDesc, dwSize); ./dlls/setupapi/misc.c:96:LPVOID WINAPI MyRealloc(LPVOID lpSrc, DWORD dwSize) ./dlls/setupapi/parser.c:165: new_array = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, array, new_count * elem ); ./dlls/setupapi/parser.c:246: if (!(section = HeapReAlloc( GetProcessHeap(), 0, section, size ))) return NULL; ./dlls/setupapi/parser.c:885: file->sections = HeapReAlloc( GetProcessHeap(), 0, file->sections, ./dlls/setupapi/parser.c:891: file->fields = HeapReAlloc( GetProcessHeap(), 0, file->fields, ./dlls/setupapi/parser.c:895: file->strings = HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, file->strings, ./dlls/setupapi/virtcopy.c:129: vhstrlist = HeapReAlloc(heap, HEAP_ZERO_MEMORY, vhstrlist, ./dlls/setupapi/virtcopy.c:240: pvnlist = HeapReAlloc(heap, HEAP_ZERO_MEMORY, pvnlist, ./dlls/shdocvw/events.c:209: This->sinks = heap_realloc(This->sinks, ./dlls/shell32/control.c:88: applet = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, applet, ./dlls/shell32/dialogs.c:278: pszCmd = HeapReAlloc(GetProcessHeap(), 0, pszCmd, icCmd) ; ./dlls/shell32/dialogs.c:347: pszList = HeapReAlloc(GetProcessHeap(), 0, pszList, ++icList) ; ./dlls/shell32/shell32_main.c:112: hargv=GlobalReAlloc(hargv, size, 0); ./dlls/shell32/shlfileop.c:926: FILE_ENTRY *new = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list->feFiles, ./dlls/shlwapi/clist.c:112: lpIter = (LPDATABLOCK_HEADER)LocalReAlloc((HLOCAL)*lppList, ./dlls/shlwapi/clist.c:288: lpTemp = (LPDATABLOCK_HEADER)LocalReAlloc((HLOCAL)pItem, ulSize, ./dlls/shlwapi/clist.c:404: lpList = (LPDATABLOCK_HEADER)LocalReAlloc((HLOCAL)*lppList, ulNewSize, ./dlls/shlwapi/ordinal.c:2163: info->mem = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, info->mem, size); ./dlls/snmpapi/main.c:165:LPVOID WINAPI SnmpUtilMemReAlloc(LPVOID mem, UINT nbytes) ./dlls/snmpapi/main.c:168: return HeapReAlloc(GetProcessHeap(), 0, mem, nbytes); ./dlls/snmpapi/main.c:285: if (!(ids = HeapReAlloc(GetProcessHeap(), 0, dst->ids, size))) ./dlls/twain_32/dsm_ctrl.c:87: devices = realloc(devices, sizeof(devices[0])*(nrdevices+1)); ./dlls/urlmon/umon.c:1052: This->URLName = heap_realloc(This->URLName, (sizeStr+1)*sizeof(WCHAR)); ./dlls/user32/dde_misc.c:1327: hData = GlobalReAlloc((HGLOBAL)hData, new_sz + sizeof(DDE_DATAHANDLE_HEAD), ./dlls/user32/edit.c:1733: hloc32W_new = LocalReAlloc(es->hloc32W, alloc_size, LMEM_MOVEABLE | LMEM_ZEROINIT); ./dlls/user32/edit.c:1900: if ((hNew32W = LocalReAlloc(es->hloc32W, alloc_size, LMEM_MOVEABLE | LMEM_ZEROINIT))) { ./dlls/user32/edit.c:1937: if ((es->undo_text = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, es->undo_text, alloc_size))) { ./dlls/user32/edit.c:2474: hloc32A_new = LocalReAlloc(es->hloc32A, alloc_size, LMEM_MOVEABLE | LMEM_ZEROINIT); ./dlls/user32/edit.c:2503: hloc16_new = LocalReAlloc16(es->hloc16, alloc_size, LMEM_MOVEABLE | LMEM_ZEROINIT); ./dlls/user32/listbox.c:1560: item = HeapReAlloc( GetProcessHeap(), 0, descr->items, ./dlls/user32/listbox.c:1726: item = HeapReAlloc( GetProcessHeap(), 0, descr->items, ./dlls/user32/listbox.c:735: item = HeapReAlloc( GetProcessHeap(), 0, descr->items, ./dlls/user32/mdi.c:1229: ci->child = HeapReAlloc(GetProcessHeap(), 0, ci->child, sizeof(HWND) * ci->nActiveChildren); ./dlls/user32/menu.c:3856: menu->items = HeapReAlloc( GetProcessHeap(), 0, menu->items, ./dlls/user32/message.c:1328: tmp = HeapReAlloc( GetProcessHeap(), 0, dde_pairs, ./dlls/user32/message.c:267: if (!(ret = HeapReAlloc( GetProcessHeap(), 0, *buffer, size ))) ./dlls/user32/msgbox.c:55: threadWindows->handles = HeapReAlloc(GetProcessHeap(), 0, threadWindows->handles, ./dlls/user32/static.c:728: if (!(text = HeapReAlloc( GetProcessHeap(), 0, text, buf_size * sizeof(WCHAR) ))) ./dlls/user32/tests/msg.c:1498: sequence = HeapReAlloc( GetProcessHeap(), 0, sequence, sequence_size * sizeof (struct message) ); ./dlls/user32/user16.c:1761: target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2);\ ./dlls/user32/user16.c:1826: b = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, b, sz); ./dlls/user32/user16.c:1866: target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize); ./dlls/user32/user_private.h:55: ret = LocalReAlloc16 (handle, size, flags); ./dlls/user32/win.c:278: HWND *new_list = HeapReAlloc( GetProcessHeap(), 0, list, (size+16) * sizeof(HWND) ); ./dlls/user32/winpos.c:1773: newhdwp = USER_HEAP_REALLOC( hdwp, ./dlls/usp10/usp10.c:185:static inline void *heap_realloc_zero(LPVOID mem, SIZE_T size) ./dlls/usp10/usp10.c:187: return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); ./dlls/usp10/usp10.c:626: if (!(tmp = heap_realloc_zero(analysis->pItem, num_items * sizeof(SCRIPT_ITEM) + 1))) ./dlls/winealsa.drv/alsa.c:136: omr->messages = HeapReAlloc(GetProcessHeap(),0,omr->messages, omr->ring_buffer_size * sizeof(ALSA_MSG)); ./dlls/winealsa.drv/dscapture.c:231: notifies = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->notifies, len); ./dlls/winealsa.drv/waveinit.c:455: *array = HeapReAlloc(GetProcessHeap(), 0, *array, sizeof(*ww) * (*alloced)); ./dlls/winedos/int31.c:1288: ptr = DPMI_xrealloc( (void *)handle, size ); ./dlls/winedos/int31.c:252:static LPVOID DPMI_xrealloc( LPVOID ptr, DWORD newsize ) ./dlls/winedos/vga.c:700: vga_text_old = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/wineesd.drv/audio.c:586: mr->messages = HeapReAlloc(GetProcessHeap(),0,mr->messages, mr->ring_buffer_size * sizeof(RING_MSG)); ./dlls/wineesd.drv/audio.c:819: wwo->sound_buffer = HeapReAlloc(GetProcessHeap(), 0, wwo->sound_buffer, toWrite); ./dlls/winejack.drv/audio.c:518: wwo->sound_buffer = HeapReAlloc(GetProcessHeap(), 0, wwo->sound_buffer, wwo->buffer_size); ./dlls/winenas.drv/audio.c:499: mr->messages = HeapReAlloc(GetProcessHeap(),0,mr->messages, mr->ring_buffer_size * sizeof(RING_MSG)); ./dlls/wineoss.drv/audio.c:1314: omr->messages = HeapReAlloc(GetProcessHeap(),0,omr->messages, omr->ring_buffer_size * sizeof(OSS_MSG)); ./dlls/wineoss.drv/dscapture.c:329: This->capture_buffer->notifies = HeapReAlloc(GetProcessHeap(), ./dlls/wineoss.drv/dsrender.c:315: This->notifies = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/wineoss.drv/dsrender.c:472: This->drv->secondaries = HeapReAlloc(GetProcessHeap(),0, ./dlls/wineps.drv/glyphlist.c:91: newGlyphList = HeapReAlloc(PSDRV_Heap, 0, glyphList, ./dlls/wineps.drv/ppd.c:274: buf = HeapReAlloc( PSDRV_Heap, 0, buf, ./dlls/wineps.drv/ppd.c:285: buf = HeapReAlloc( PSDRV_Heap, 0, buf, len + sl + 1 ); ./dlls/wineps.drv/type1.c:132: str->str = HeapReAlloc(GetProcessHeap(), 0, str->str, str->max_len); ./dlls/wineps.drv/type1.c:214: t1->glyph_sent = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/wineps.drv/type42.c:258: t42->glyf_blocks = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/wineps.drv/type42.c:312: t42->glyph_sent = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/winex11.drv/palette.c:1107: mapping = HeapReAlloc( GetProcessHeap(), 0, prev_mapping, sizeof(int)*num_entries); ./dlls/winex11.drv/wintab.c:522: cursor->BTNNAMES = HeapReAlloc(GetProcessHeap(), 0, cursor->BTNNAMES, sizeof(WCHAR)*cchBuf); ./dlls/winex11.drv/wintab.c:529: cursor->BTNNAMES = HeapReAlloc(GetProcessHeap(), 0, cursor->BTNNAMES, sizeof(WCHAR)*cchPos); ./dlls/winex11.drv/xdnd.c:400: out = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, out, capacity + 1); ./dlls/winex11.drv/xfont.c:1850: !(buffer = HeapReAlloc( GetProcessHeap(), 0, buffer, *buf_size = len ))) ./dlls/winex11.drv/xfont.c:2812: if( (newCache = HeapReAlloc(GetProcessHeap(), 0, fontCache, prev_i * sizeof(fontObject))) ) ./dlls/winex11.drv/xim.c:175: HeapReAlloc(GetProcessHeap(), 0, ./dlls/winex11.drv/xrender.c:391: glyphsetCache = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/winex11.drv/xrender.c:657: formatEntry->realized = HeapReAlloc(GetProcessHeap(), ./dlls/winex11.drv/xrender.c:668: formatEntry->bitmaps = HeapReAlloc(GetProcessHeap(), ./dlls/winex11.drv/xrender.c:678: formatEntry->gis = HeapReAlloc(GetProcessHeap(), ./dlls/wininet/ftp.c:3444: tmpafp = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *lpafp, ./dlls/wininet/ftp.c:3463: tmpafp = HeapReAlloc(GetProcessHeap(), 0, *lpafp, ./dlls/wininet/http.c:3043: lpszRawHeaders = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); ./dlls/wininet/http.c:3089: lpszRawHeaders = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); ./dlls/wininet/http.c:3301: lpsztmp = HeapReAlloc(GetProcessHeap(), 0, lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR)); ./dlls/wininet/http.c:3511: lph = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, lpwhr->pCustHeaders, sizeof(HTTPHEADERW) * count); ./dlls/wininet/internet.c:124: p = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, ./dlls/winmm/lolvldrv.c:539: HeapReAlloc(GetProcessHeap(), 0, llTypes[type].lpMlds - 1, ./dlls/winmm/mmsystem.c:2653: ptr32 = HeapReAlloc(GetProcessHeap(), 0, ptr32, size); ./dlls/winspool.drv/info.c:1433: new_array = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, printer_handles, ./dlls/winspool.drv/info.c:5279: bufferW = (bufferW) ? HeapReAlloc(GetProcessHeap(), 0, bufferW, needed) : ./dlls/winspool.drv/info.c:7049: bufferW = (bufferW) ? HeapReAlloc(GetProcessHeap(), 0, bufferW, needed) : ./dlls/winspool.drv/info.c:769: pent=HeapReAlloc(GetProcessHeap(),0,pent,strlen(pent)+strlen(start)+1); ./dlls/winspool.drv/tests/info.c:1385: buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, cbBuf*2); ./dlls/winspool.drv/tests/info.c:1404: buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, cbBuf*2); ./dlls/wintab32/context.c:997: context->PacketQueue = HeapReAlloc(GetProcessHeap(), 0, ./dlls/wintrust/wintrust_main.c:531:void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb) ./dlls/wintrust/wintrust_main.c:533: return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ptr, cb); ./dlls/wintrust/wintrust_main.c:546: data->pahStores = WINTRUST_ReAlloc(data->pahStores, ./dlls/wintrust/wintrust_main.c:580: data->pasSigners = WINTRUST_ReAlloc(data->pasSigners, ./dlls/wintrust/wintrust_main.c:627: WINTRUST_ReAlloc(data->pasSigners[idxSigner].pasCertChain, ./dlls/ws2_32/async.c:428: extrabuf=HeapReAlloc(GetProcessHeap(),0,extrabuf,ebufsize) ; ./dlls/ws2_32/socket.c:3164: extrabuf=HeapReAlloc(GetProcessHeap(),0,extrabuf,ebufsize) ; ./dlls/ws2_32/socket.c:3210: extrabuf=HeapReAlloc(GetProcessHeap(),0,extrabuf,ebufsize) ; ./dlls/ws2_32/socket.c:3451: ai->ai_addr = HeapReAlloc(GetProcessHeap(),0,ai->ai_addr,len); ./include/msvcrt/crtdbg.h:121:#define _realloc_dbg(p,s,t,f,l) realloc(p,s) ./include/windowsx.h:121:#define GlobalReAllocPtr(lp, cbNew, flags) (GlobalUnlockPtr(lp), GlobalLock(GlobalReAlloc(GlobalPtrHandle(lp) , (cbNew), (flags)))) ./libs/wine/debug.c:255: if ((ret = realloc( list[idx], size ))) list[idx] = ret; ./libs/wine/ldt.c:334:unsigned short wine_ldt_realloc_entries( unsigned short sel, int oldcount, int newcount ) ./libs/wpp/ppl.l:1132: strbuffer = pp_xrealloc(strbuffer, strbuf_alloc * sizeof(strbuffer[0])); ./libs/wpp/ppl.l:1329: mep->curarg = pp_xrealloc(mep->curarg, mep->curargalloc * sizeof(mep->curarg[0])); ./libs/wpp/ppl.l:1344: mep->args = pp_xrealloc(mep->args, (mep->nargs+1) * sizeof(mep->args[0])); ./libs/wpp/ppl.l:1345: mep->ppargs = pp_xrealloc(mep->ppargs, (mep->nargs+1) * sizeof(mep->ppargs[0])); ./libs/wpp/ppl.l:1346: mep->nnls = pp_xrealloc(mep->nnls, (mep->nargs+1) * sizeof(mep->nnls[0])); ./libs/wpp/ppl.l:876: buf = pp_xrealloc(buf, 32); ./libs/wpp/ppl.l:882: buf = pp_xrealloc(buf, strlen(pp_status.input) + 3); ./libs/wpp/ppl.l:932: curdef_text = pp_xrealloc(curdef_text, curdef_alloc * sizeof(curdef_text[0])); ./libs/wpp/ppl.yy.c:2785: ppy_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); ./libs/wpp/ppl.yy.c:310:void *ppy_realloc (void *,yy_size_t ); ./libs/wpp/ppl.yy.c:3202: * immediate realloc on the next call. ./libs/wpp/ppl.yy.c:3222: (yy_buffer_stack) = (struct yy_buffer_state**)ppy_realloc ./libs/wpp/ppl.yy.c:3332: (yy_start_stack) = (int *) ppy_realloc((void *) (yy_start_stack),new_size ); ./libs/wpp/ppl.yy.c:3551:void *ppy_realloc (void * ptr, yy_size_t size ) ./libs/wpp/ppl.yy.c:3560: return (void *) realloc( (char *) ptr, size ); ./libs/wpp/ppl.yy.c:3565: free( (char *) ptr ); /* see ppy_realloc() for (char *) cast */ ./libs/wpp/ppl.yy.c:3731: buf = pp_xrealloc(buf, 32); ./libs/wpp/ppl.yy.c:3737: buf = pp_xrealloc(buf, strlen(pp_status.input) + 3); ./libs/wpp/ppl.yy.c:3787: curdef_text = pp_xrealloc(curdef_text, curdef_alloc * sizeof(curdef_text[0])); ./libs/wpp/ppl.yy.c:3987: strbuffer = pp_xrealloc(strbuffer, strbuf_alloc * sizeof(strbuffer[0])); ./libs/wpp/ppl.yy.c:4184: mep->curarg = pp_xrealloc(mep->curarg, mep->curargalloc * sizeof(mep->curarg[0])); ./libs/wpp/ppl.yy.c:4199: mep->args = pp_xrealloc(mep->args, (mep->nargs+1) * sizeof(mep->args[0])); ./libs/wpp/ppl.yy.c:4200: mep->ppargs = pp_xrealloc(mep->ppargs, (mep->nargs+1) * sizeof(mep->ppargs[0])); ./libs/wpp/ppl.yy.c:4201: mep->nnls = pp_xrealloc(mep->nnls, (mep->nargs+1) * sizeof(mep->nnls[0])); ./libs/wpp/ppy.tab.c:2552: macro_args = pp_xrealloc(macro_args, nmacro_args * sizeof(macro_args[0])); ./libs/wpp/ppy.tab.c:2590: tail->subst.text = pp_xrealloc(tail->subst.text, strlen(tail->subst.text)+strlen(mtp->subst.text)+1); ./libs/wpp/ppy.tab.c:2656: s1 = pp_xrealloc(s1, l1+l2+1); ./libs/wpp/ppy.y:550: macro_args = pp_xrealloc(macro_args, nmacro_args * sizeof(macro_args[0])); ./libs/wpp/ppy.y:588: tail->subst.text = pp_xrealloc(tail->subst.text, strlen(tail->subst.text)+strlen(mtp->subst.text)+1); ./libs/wpp/ppy.y:654: s1 = pp_xrealloc(s1, l1+l2+1); ./libs/wpp/preproc.c:350: includepath = pp_xrealloc(includepath, nincludepath * sizeof(*includepath)); ./libs/wpp/preproc.c:90:void *pp_xrealloc(void *p, size_t size) ./libs/wpp/preproc.c:95: res = realloc(p, size); ./programs/cmd/directory.c:513: fd = HeapReAlloc(GetProcessHeap(),0,fd,(entry_count+1)*sizeof(WIN32_FIND_DATA)); ./programs/oleview/typelib.c:200: pTLData->idl = HeapReAlloc(GetProcessHeap(), 0, pTLData->idl, ./programs/oleview/typelib.c:222: pTLData->idl = HeapReAlloc(GetProcessHeap(), 0, pTLData->idl, ./programs/progman/grpfile.c:125: hNewBuffer = LocalReAlloc(hBuffer, size + MALLOCHUNK + 1, ./programs/regedit/edit.c:138: if ((valueData = HeapReAlloc(GetProcessHeap(), 0, stringValueData, (len + 1) * sizeof(TCHAR)))) { ./programs/regedit/hexedit.c:295: infoPtr->pData = HeapReAlloc(GetProcessHeap(), 0, infoPtr->pData, infoPtr->cbData + 1); ./programs/regedit/listview.c:71: newStr = HeapReAlloc(GetProcessHeap(), 0, curStr, maxLen * 2); ./programs/regedit/regproc.c:513: new_buffer = HeapReAlloc (GetProcessHeap(), 0, line, new_size); ./programs/regedit/regproc.c:630: *buffer = HeapReAlloc(GetProcessHeap(), 0, *buffer, *len * sizeof(**buffer)); ./programs/regedit/regproc.c:707: else *val_buf = HeapReAlloc(GetProcessHeap(), 0, *val_buf, *val_size); ./programs/regedit/treeview.c:85: newStr = HeapReAlloc(GetProcessHeap(), 0, *pKeyPath, *pMaxLen * 2); ./programs/uninstaller/main.c:211: entries = HeapReAlloc(GetProcessHeap(), 0, entries, numentries*sizeof(uninst_entry)); ./programs/wineboot/shutdown.c:54: struct window_info *new_win = HeapReAlloc( GetProcessHeap(), 0, windows, ./programs/winecfg/audio.c:527: loadedAudioDrv = HeapReAlloc(GetProcessHeap(), 0, loadedAudioDrv, (numFound + 1) * sizeof(AUDIO_DRIVER)); ./programs/winecfg/audio.c:542: loadedAudioDrv = HeapReAlloc(GetProcessHeap(), 0, loadedAudioDrv, (numFound + 1) * sizeof(AUDIO_DRIVER)); ./programs/winecfg/winecfg.c:517: if (values) values = HeapReAlloc(GetProcessHeap(), 0, values, sizeof(WCHAR*) * (valueslen + 1)); ./programs/winecfg/winecfg.c:557: if (values) values = HeapReAlloc(GetProcessHeap(), 0, values, sizeof(WCHAR*) * (valueslen + 1)); ./programs/winecfg/winecfg.c:566: values = HeapReAlloc(GetProcessHeap(), 0, values, sizeof(WCHAR*) * (valueslen + 1)); ./programs/wineconsole/curses.c:250: PRIVATE(data)->line = HeapReAlloc(GetProcessHeap(), 0, PRIVATE(data)->line, ./programs/wineconsole/dialog.c:400: di->font = HeapReAlloc(GetProcessHeap(), 0, di->font, sizeof(*di->font) * (di->nFont + 1)); ./programs/wineconsole/wineconsole.c:322: data->cells = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->cells, ./programs/winedbg/break.c:221: dbg_heap_realloc(dbg_curr_process->delayed_bp, ./programs/winedbg/break.c:261: dbg_curr_process->delayed_bp = dbg_heap_realloc(dbg_curr_process->delayed_bp, ./programs/winedbg/dbg.tab.c:3318: *line = dbg_heap_realloc(*line, alloc); ./programs/winedbg/dbg.y:480: *line = dbg_heap_realloc(*line, alloc); ./programs/winedbg/debugger.h:459:static inline void* dbg_heap_realloc(void* buffer, size_t size) ./programs/winedbg/debugger.h:461: return (buffer) ? HeapReAlloc(GetProcessHeap(), 0, buffer, size) : ./programs/winedbg/debug.l:242: local_lexemes = dbg_heap_realloc(local_lexemes, alloc_lexeme * sizeof(local_lexemes[0])); ./programs/winedbg/debug.yy.c:1908: dbg_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); ./programs/winedbg/debug.yy.c:2346: (yy_buffer_stack) = (struct yy_buffer_state**)dbg_realloc ./programs/winedbg/debug.yy.c:2629:void *dbg_realloc (void * ptr, yy_size_t size ) ./programs/winedbg/debug.yy.c:2638: return (void *) realloc( (char *) ptr, size ); ./programs/winedbg/debug.yy.c:2643: free( (char *) ptr ); /* see dbg_realloc() for (char *) cast */ ./programs/winedbg/debug.yy.c:2666: local_lexemes = dbg_heap_realloc(local_lexemes, alloc_lexeme * sizeof(local_lexemes[0])); ./programs/winedbg/debug.yy.c:310:void *dbg_realloc (void *,yy_size_t ); ./programs/winedbg/display.c:210: displaypoints = dbg_heap_realloc(displaypoints, ./programs/winedbg/display.c:227: displaypoints = dbg_heap_realloc(displaypoints, ./programs/winedbg/display.c:70: displaypoints = dbg_heap_realloc(displaypoints, ./programs/winedbg/gdbproxy.c:2065: gdbctx->in_buf = realloc(gdbctx->in_buf, gdbctx->in_buf_alloc += STEP); ./programs/winedbg/gdbproxy.c:821: gdbctx->out_buf = realloc(gdbctx->out_buf, gdbctx->out_buf_alloc); ./programs/winedbg/info.c:186: im->mi = dbg_heap_realloc(im->mi, im->num_alloc * sizeof(*im->mi)); ./programs/winedbg/info.c:298: cw->table = dbg_heap_realloc(cw->table, cw->alloc * sizeof(ATOM)); ./programs/winedbg/source.c:74: new = HeapReAlloc(GetProcessHeap(), 0, search_path, pos + size); ./programs/winedbg/stack.c:193: dbg_curr_thread->frames = dbg_heap_realloc(dbg_curr_thread->frames, ./programs/winedbg/tgt_active.c:861: if (!(cmd_line = HeapReAlloc(GetProcessHeap(), 0, cmd_line, len))) ./programs/winetest/main.c:239: rev_infos = xrealloc (rev_infos, size * sizeof (*rev_infos)); ./programs/winetest/main.c:286: test->name = xrealloc (test->name, exepos - test->name + 1); ./programs/winetest/main.c:426: test->subtests = xrealloc (test->subtests, ./programs/winetest/main.c:432: test->subtests = xrealloc (test->subtests, ./programs/winetest/util.c:35:void *xrealloc (void *op, size_t len) ./programs/winetest/util.c:37: void *p = realloc (op, len); ./programs/winetest/util.c:63: q = realloc (p, size); ./programs/winhelp/hlpfile.c:1479: hlpfile->windows = HeapReAlloc(GetProcessHeap(), 0, hlpfile->windows, ./programs/winhelp/hlpfile.c:676: bi = HeapReAlloc(GetProcessHeap(), 0, bi, sizeof(*bi) + nc * sizeof(RGBQUAD)); ./programs/winhelp/hlpfile.c:834: hlpfile->bmps = HeapReAlloc(GetProcessHeap(), 0, hlpfile->bmps, ./programs/winhelp/macro.c:844: else MACRO_Loaded = HeapReAlloc(GetProcessHeap(), 0, MACRO_Loaded, size); ./programs/winhelp/macro.lex.yy.c:1049: yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); ./programs/winhelp/macro.lex.yy.c:1487: (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc ./programs/winhelp/macro.lex.yy.c:1770:void *yyrealloc (void * ptr, yy_size_t size ) ./programs/winhelp/macro.lex.yy.c:1779: return (void *) realloc( (char *) ptr, size ); ./programs/winhelp/macro.lex.yy.c:1784: free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ ./programs/winhelp/macro.lex.yy.c:310:void *yyrealloc (void *,yy_size_t ); ./server/atom.c:146: new_table = realloc( table->handles, sizeof(*table->handles) * new_size ); ./server/change.c:675: p = realloc( *path, len + extra ); ./server/console.c:240: evts->events = realloc( evts->events, evts->num_alloc * sizeof(*evt) ); ./server/console.c:561: if (!(new_rec = realloc( console->records, ./server/console.c:626: INPUT_RECORD *new_rec = realloc( console->records, ./server/fd.c:686: if (!(newusers = realloc( poll_users, new_count * sizeof(*poll_users) ))) return -1; ./server/fd.c:687: if (!(newpoll = realloc( pollfd, new_count * sizeof(*pollfd) ))) ./server/handle.c:198: if (!(new_entries = realloc( table->entries, count * sizeof(struct handle_entry) ))) ./server/handle.c:318: if (!(new_entries = realloc( table->entries, count * sizeof(*new_entries) ))) return; ./server/process.c:172: if (!(entry = realloc( ptid_entries, count * sizeof(*entry) ))) ./server/region.c:113: rectangle_t *new_rect = realloc( reg->rects, 2 * sizeof(rectangle_t) * reg->size ); ./server/region.c:327: if ((new_rects = realloc( newReg->rects, sizeof(*newReg->rects) * new_size ))) ./server/region.c:721: rectangle_t *rect = realloc( dst->rects, src->num_rects * sizeof(*rect) ); ./server/registry.c:1003: if (!(new_val = realloc( key->values, nb_values * sizeof(*new_val) ))) return; ./server/registry.c:1045: if (!(newbuf = realloc( info->buffer, newlen ))) ./server/registry.c:1060: if (!(tmp = realloc( info->tmp, size ))) ./server/registry.c:486: if (!(new_subkeys = realloc( key->subkeys, nb_subkeys * sizeof(*new_subkeys) ))) ./server/registry.c:552: if (!(new_subkeys = realloc( parent->subkeys, nb_subkeys * sizeof(*new_subkeys) ))) return; ./server/registry.c:801: if (!(new_val = realloc( key->values, nb_values * sizeof(*new_val) ))) ./server/user.c:71: if (!(new_handles = realloc( handles, new_size * sizeof(*handles) ))) ./server/window.c:246: user_handle_t *new_array = realloc( array->handles, new_total * sizeof(*new_array) ); ./server/window.c:290: if (!(new_props = realloc( win->properties, ./tools/fnt2bdf.c:596: if( !(lpfont = (unsigned char*) realloc( lpfont, length )) ) ./tools/makedep.c:111:static void *xrealloc (void *ptr, size_t size) ./tools/makedep.c:115: if (!(res = realloc( ptr, size ))) ./tools/makedep.c:198: buffer = xrealloc( buffer, size * 2 ); ./tools/widl/parser.l:353: cbuffer = xrealloc(cbuffer, cbufalloc * sizeof(cbuffer[0])); ./tools/widl/parser.yy.c:1269: parser_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); ./tools/widl/parser.yy.c:1686: * immediate realloc on the next call. ./tools/widl/parser.yy.c:1706: (yy_buffer_stack) = (struct yy_buffer_state**)parser_realloc ./tools/widl/parser.yy.c:1816: (yy_start_stack) = (int *) parser_realloc((void *) (yy_start_stack),new_size ); ./tools/widl/parser.yy.c:2030:void *parser_realloc (void * ptr, yy_size_t size ) ./tools/widl/parser.yy.c:2039: return (void *) realloc( (char *) ptr, size ); ./tools/widl/parser.yy.c:2044: free( (char *) ptr ); /* see parser_realloc() for (char *) cast */ ./tools/widl/parser.yy.c:211: * and can realloc() it to grow it, and should free() it to ./tools/widl/parser.yy.c:2232: cbuffer = xrealloc(cbuffer, cbufalloc * sizeof(cbuffer[0])); ./tools/widl/parser.yy.c:310:void *parser_realloc (void *,yy_size_t ); ./tools/widl/utils.c:174: line = xrealloc(line, len); ./tools/widl/utils.c:198:void *xrealloc(void *p, size_t size) ./tools/widl/utils.c:203: res = realloc(p, size); ./tools/widl/write_msft.c:1395: typeinfo->func_data = xrealloc(typeinfo->func_data, typeinfo->func_data_allocated); ./tools/widl/write_msft.c:1524: typeinfo->func_indices = xrealloc(typeinfo->func_indices, typeinfo->funcs_allocated * sizeof(int)); ./tools/widl/write_msft.c:1525: typeinfo->func_names = xrealloc(typeinfo->func_names, typeinfo->funcs_allocated * sizeof(int)); ./tools/widl/write_msft.c:1526: typeinfo->func_offsets = xrealloc(typeinfo->func_offsets, typeinfo->funcs_allocated * sizeof(int)); ./tools/widl/write_msft.c:1634: typeinfo->var_data = xrealloc(typeinfo->var_data, typeinfo->var_data_allocated); ./tools/widl/write_msft.c:1654: typeinfo->var_indices = xrealloc(typeinfo->var_indices, typeinfo->vars_allocated * sizeof(int)); ./tools/widl/write_msft.c:1655: typeinfo->var_names = xrealloc(typeinfo->var_names, typeinfo->vars_allocated * sizeof(int)); ./tools/widl/write_msft.c:1656: typeinfo->var_offsets = xrealloc(typeinfo->var_offsets, typeinfo->vars_allocated * sizeof(int)); ./tools/widl/write_msft.c:391: block = xrealloc(typelib->typelib_segment_data[segment], block_size << 1); ./tools/winapi/nativeapi.dat:171:realloc ./tools/winebuild/import.c:106: table->names = xrealloc( table->names, table->size * sizeof(*table->names) ); ./tools/winebuild/import.c:309: dll_imports = xrealloc( dll_imports, (nb_imports+1) * sizeof(*dll_imports) ); ./tools/winebuild/import.c:371: imp->imports = xrealloc( imp->imports, (imp->nb_imports+1) * sizeof(*imp->imports) ); ./tools/winebuild/main.c:385: lib_path = xrealloc( lib_path, (nb_lib_paths+1) * sizeof(*lib_path) ); ./tools/winebuild/main.c:448: res_files = xrealloc( res_files, (nb_res_files+1) * sizeof(*res_files) ); ./tools/winebuild/parser.c:153: spec->entry_points = xrealloc( spec->entry_points, ./tools/winebuild/parser.c:203: value_array = xrealloc(value_array, ./tools/winebuild/parser.c:216: odp->u.var.values = xrealloc(value_array, sizeof(*value_array) * n_values); ./tools/winebuild/res16.c:84: spec->resources = xrealloc( spec->resources, (spec->nb_resources + 1) * sizeof(*spec->resources) ); ./tools/winebuild/res16.c:91: tree->types = xrealloc( tree->types, (tree->nb_types + 1) * sizeof(*tree->types) ); ./tools/winebuild/res32.c:118: type->names = xrealloc( type->names, (type->nb_names + 1) * sizeof(*type->names) ); ./tools/winebuild/res32.c:130: tree->types = xrealloc( tree->types, (tree->nb_types + 1) * sizeof(*tree->types) ); ./tools/winebuild/res32.c:98: spec->resources = xrealloc( spec->resources, (spec->nb_resources + 1) * sizeof(spec->resources[0]) ); ./tools/winebuild/utils.c:63:void *xrealloc (void *ptr, size_t size) ./tools/winebuild/utils.c:65: void *res = realloc (ptr, size); ./tools/winedump/debug.c:709: stabbuff = realloc(stabbuff, stabbufflen); ./tools/winegcc/utils.c:115: arr->base = xrealloc(arr->base, sizeof(*(arr->base)) * arr->maximum); ./tools/winegcc/utils.c:60:void *xrealloc(void* p, size_t size) ./tools/winegcc/utils.c:62: void* p2 = realloc (p, size); ./tools/wmc/mcl.c:342: ungetstack = xrealloc(ungetstack, allocungetstack * sizeof(*ungetstack)); ./tools/wmc/mcl.c:367: charstack = xrealloc(charstack, alloccharstack * sizeof(*charstack)); ./tools/wmc/mcl.c:403: unicharstack = xrealloc(unicharstack, allocunicharstack * sizeof(*unicharstack)); ./tools/wmc/mcl.c:567: tokentable = xrealloc(tokentable, ntokentable * sizeof(*tokentable)); ./tools/wmc/mcy.tab.c:2328: s1 = xrealloc(s1, (l1 + l2 + 1) * sizeof(*s1)); ./tools/wmc/mcy.tab.c:2375: msg->msgs = xrealloc(msg->msgs, (msg->nmsgs+1) * sizeof(*(msg->msgs))); ./tools/wmc/mcy.tab.c:2515: msgtab = xrealloc(msgtab, (nmsg+1) * sizeof(*msgtab)); ./tools/wmc/mcy.tab.c:2554: blk->msgs = xrealloc(blk->msgs, (blk->nmsg+1) * sizeof(*blk->msgs)); ./tools/wmc/mcy.tab.c:2560: lbp->blks = xrealloc(lbp->blks, lbp->nblk * sizeof(*lbp->blks)); ./tools/wmc/mcy.tab.c:2582: cpxlattab = xrealloc(cpxlattab, (ncpxlattab+1) * sizeof(*cpxlattab)); ./tools/wmc/mcy.y:410: s1 = xrealloc(s1, (l1 + l2 + 1) * sizeof(*s1)); ./tools/wmc/mcy.y:457: msg->msgs = xrealloc(msg->msgs, (msg->nmsgs+1) * sizeof(*(msg->msgs))); ./tools/wmc/mcy.y:597: msgtab = xrealloc(msgtab, (nmsg+1) * sizeof(*msgtab)); ./tools/wmc/mcy.y:636: blk->msgs = xrealloc(blk->msgs, (blk->nmsg+1) * sizeof(*blk->msgs)); ./tools/wmc/mcy.y:642: lbp->blks = xrealloc(lbp->blks, lbp->nblk * sizeof(*lbp->blks)); ./tools/wmc/mcy.y:664: cpxlattab = xrealloc(cpxlattab, (ncpxlattab+1) * sizeof(*cpxlattab)); ./tools/wmc/utils.c:158: res = realloc(p, size); ./tools/wrc/genres.c:62: r->data = xrealloc(r->data, r->allocsize); ./tools/wrc/newstruc.c:1132: dst->data = xrealloc(dst->data, dst->size + len); ./tools/wrc/newstruc.c:427: *list = xrealloc(*list, sizeof(id_alloc_t) * (*n+1)); ./tools/wrc/newstruc.c:979: w->words = xrealloc(w->words, (w->nwords+1) * sizeof(WORD)); ./tools/wrc/parser.l:576: cbuffer = xrealloc(cbuffer, cbufalloc * sizeof(cbuffer[0])); ./tools/wrc/parser.l:588: wbuffer = xrealloc(wbuffer, wbufalloc * sizeof(wbuffer[0])); ./tools/wrc/parser.tab.c:3925: tagstt->entries = xrealloc(tagstt->entries, sizeof(tagstt->entries[0]) * tagstt->nentries); ./tools/wrc/parser.tab.c:5289: r1->data = xrealloc(r1->data, r1->size + r2->size); ./tools/wrc/parser.tab.c:5649: fnt = xrealloc(fnt, nfnt * sizeof(*fnt)); ./tools/wrc/parser.tab.c:5655: fnd = xrealloc(fnd, nfnd * sizeof(*fnd)); ./tools/wrc/parser.y:1494: tagstt->entries = xrealloc(tagstt->entries, sizeof(tagstt->entries[0]) * tagstt->nentries); ./tools/wrc/parser.y:2431: r1->data = xrealloc(r1->data, r1->size + r2->size); ./tools/wrc/parser.y:2791: fnt = xrealloc(fnt, nfnt * sizeof(*fnt)); ./tools/wrc/parser.y:2797: fnd = xrealloc(fnd, nfnd * sizeof(*fnd)); ./tools/wrc/parser.yy.c:1998: parser_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); ./tools/wrc/parser.yy.c:2435: (yy_buffer_stack) = (struct yy_buffer_state**)parser_realloc ./tools/wrc/parser.yy.c:2545: (yy_start_stack) = (int *) parser_realloc((void *) (yy_start_stack),new_size ); ./tools/wrc/parser.yy.c:2759:void *parser_realloc (void * ptr, yy_size_t size ) ./tools/wrc/parser.yy.c:2768: return (void *) realloc( (char *) ptr, size ); ./tools/wrc/parser.yy.c:2773: free( (char *) ptr ); /* see parser_realloc() for (char *) cast */ ./tools/wrc/parser.yy.c:2790: cbuffer = xrealloc(cbuffer, cbufalloc * sizeof(cbuffer[0])); ./tools/wrc/parser.yy.c:2802: wbuffer = xrealloc(wbuffer, wbufalloc * sizeof(wbuffer[0])); ./tools/wrc/parser.yy.c:310:void *parser_realloc (void *,yy_size_t ); ./tools/wrc/utils.c:170:void *xrealloc(void *p, size_t size) ./tools/wrc/utils.c:175: res = realloc(p, size);

3 3

Re: mapi32: Resolve FIXME regarding attachment lists in MAPISendMail function
by Hans Leidekker 22 Dec '07

22 Dec '07

On Friday 21 December 2007 00:18:43 Mark Neyhart wrote: > Extend the MAILTO: string produced by the MAPISendMail function to include > an attachment list. Because I was unable to find any standard for MAILTO > regarding attachments, I constructed the attachment list in the format > specified for Mozilla command line options. Breaking other mail clients to gain attachments support for Mozilla is not acceptable tradeoff IMO. -Hans

4 8

re: Alexandre Julliard : kernel32: Store the initial directory as a full path in the process parameters
by Dan Kegel 22 Dec '07

22 Dec '07

That patch seems to have caused a new batch of valgrind warnings: http://kegel.com/wine/valgrind/logs-2007-12-21/vg-kernel32_process-diff.txt e.g. + Conditional jump or move depends on uninitialised value(s) + at NtAllocateVirtualMemory (virtual.c:1359) + by RtlCreateProcessParameters (env.c:461) + by create_process (process.c:1209) + by CreateProcessW (process.c:1707) + by CreateProcessA (process.c:1604) + by test_Directory (process.c:839) + by func_process (process.c:1410) + by run_test (test.h:387) + by main (test.h:436) ... + Conditional jump or move depends on uninitialised value(s) + at create_process (server.h:76) + by CreateProcessW (process.c:1707) + by CreateProcessA (process.c:1604) + by test_Directory (process.c:839) + by func_process (process.c:1410) + by run_test (test.h:387) + by main (test.h:436) -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

Re: [1/4 try 3] wined3d: Activate GL context before making any GL calls in stretch_rect_fbo
by Stefan Dösinger 21 Dec '07

21 Dec '07

Hi, I think your patches are on the right track, but there are a few issues to look at. I'll also need Henri's comments, as he wrote the fbo code. Did you try your patches with the Deferred Shading sample from codesampler? http://www.codesampler.com/usersrc/usersrc_7.htm . It uses multiple render targets, so it is a quite interesting test. drawprimitive() in drawprim.c calls apply_fbo_state before calling ActivateContext as well. This causes a lot of problems with multithreading, so this should be fixed too. The first patch is OK. Calling ActivateContext before activating the fbo is required. In patch 2, I was a bit confused by moving the "This->activeContext" assignment inside Init3D, I first thought you would remove it. But otherwise it looks good to me as well. Patch 3 is ok too, keeping track of the currently bound fbo in the context is good. Unrelated to this patch we should look if the glBindFramebufferEXT(..., 0) calls could be replaced with calling ActivateContext, and if that makes sense(it's probably not a good idea everywhere). In patch 4, you have to be aware that in CTXUSAGE_BLIT the fbo's depth and color1+ attachments might be set to bad textures(e.g. different size). So you'll have to set them to NULL or make sure that they are set properly. I once discussed with Henri where we should have all the functions. I think we could just move apply_fbo_state to context.c, make it static to make sure the code that requires a drawable calls ActivateContext. I am not entirely sure if that makes sense everywhere, e.g. the depth_blit code. Henri had some arguments in that regard, but I have to check the irc logs and digg out the discussion. Other good testing applications are Half Life 2(demo is ok), it uses color buffers and depth buffers with different sizes. Battlefield 2(not 2142, no idea if there is a demo) depends on the depth blitting. Bioshock(demo is ok) is a case of an application that crashes due to multithreading issues because apply_fbo_state is applied before calling ActivateContext. Thank you for all your excellent work, Stefan

3 2

winex11.drv: driver.c: GET_USER_FUNC
by Adam Rimon 21 Dec '07

21 Dec '07

Hi, Is there any reason for the /do { ...... } while(0);/ in the GET_USER_FUNC macro? -Adam

2 1

Direct3D Game test framework
by Stefan Dösinger 21 Dec '07

21 Dec '07

Hi, Now that we're facing Direct3D 9 feature completion soon - VTF support coming in from Henri, High order patches and thread safety from me - the d3d work will change a bit soon. Instead of adding new features we'll debug games and improve performance. It would be good if we had some automated testing framework to support the process :-) Unfortunately this isn't easy. Games do not render exactly, so verifying that a game doesn't show any visual regressions automatically may be more effort than reward. Here I think we'll have to rely on users testing the games regularly and testing regressions. I am more concerned about the performance thing. It is very easy to make some performance improvement that does more harm than good. Also benchmarks take quite some time and are affected by many external parameters. So I'd like some automated and controlled performance testing environment. Instead of building one from scratch it would be cool if we could reuse existing software. cxtest comes to my mind(www.cxtest.org). It is a test suit built by codeweavers for running regression tests on Windows apps. It can remote control applications using keyboard input and compares screenshots to reference ones. It could be used to start benchmarks automatically. A plus here is that some machines run nightly tests. However, those are VMs, so no 3D acceleration. A problem is also reading back the results. Does anyone know some applications for doing that? Windows or Linux apps, commercial or open source ones(prefered, though). Then we need benchmarking apps. Here regular Windows benchmarks come to my mind(3DMarkXYZW), games with benchmark facilities(hl2, ut, ...). We can record tests, get a reference performance counter from windows and run nightly tests(or manually started tests). A problem we're facing is reading back the results. Taking screenshots and running OCR on them is error prone, we need a way to get the numbers from the benchmarks, not an image of the numbers. Now we need a concrete collection of benchmarks. A mixture of popular Benchmarks like 3DMark would be good, and some more cientific benchmarks. So far I have: 3DMark: Popular benchmark for testing the overall performance, doesn't give very detailed results though. Controlling: Standard windows controls, keyboard events should do the job Result readback: Can write results to a file, but must take care about the licensing. Not everything is free, most likely a license is needed. Half-Life 2: Nice facility of recordable timedemos. Can record average game demos, but also demos which stress specific features. Controlling: Command line parameters Result readback: Can be asked to copy the console into the clipboard UT2004: Popular engine. Has a Linux port, but many mods only ship the d3d renderer. Controlling: Unknown Result readback: unknown. DirectX sdk demos, nvidia / ati demos: Stress specific rendering features. Good for testing performance(with vsync removed), or a bad idea? Controlling, Readback: Source code is available and can be modified. License, especially possible benchmark clauses? Other suggestions? Another nice-to-have thing would be a game independent profiling method, simmilar to the +fps debug channel, just more detailed. Some games do not have built-in benchmarking, it would still be nice to use them. That means facing some new problems? How to tell loading from in-game rendering? How to remove control those games in a repeatable way, especially if there are some random elements in the game? More detailed data from wined3d could also be used to draw nice graphs for other benchmarks :-) We'll need some hardware diversity too. It would be nice if the tests worked on Linux and MacOS, and a variety of hardware was used. I want at least nvidia, ati and intel gpu's, older and newer ones. I could also revive my ATI mach64 :-) Any other comments or suggestions? I think once I'm done with the current exam season and my patch backlog is in I will retire from direct wined3d development for a few days / weeks to set up a testing environment, then start fixing games.

10 40

Wine desktop integration: double-clicking files in file managers
by Vincent Povirk 21 Dec '07

21 Dec '07

I have attached a patch that adds a wrapper script to Wine for starting files from Linux file managers such as nautilus and modifies wine.desktop to use the script for exe, msi, lnk, chm, and hlp files. The wrapper sets the working directory to the directory containing the file and starts it using wine start with the full windows path. If wine start fails, it displays an error dialog. As I understand it, this is very close to the behavior when double-clicking a file in windows explorer. Please comment. These issues worry me in particular: I cannot double-click on exe files to open them myself because of http://bugs.winehq.org/show_bug.cgi?id=8386 (nautilus is getting confused about file types). As I understand it, this is a separate problem (and should be fixed?), but I wonder if I can do anything about it. Nautilus is not using Wine to start hlp files. I put in every mime type I could come up with for hlp, including application/x-extension-hlp. Wine does not show in the "Open With" list in nautilus. This makes the wrapper a little bit harder to use for applications installed in wine to handle specific filetypes. Is the list of file extensions I decided to use reasonable? Is the list of MIME types I decided to use for those extensions reasonable? Is there some way Wine could help the system recognize some of these types? I don't know much about this topic, unfortunately, and I'm not very confident about my list. I cannot test the kdialog command in the script myself because kdialog consistently fails to display things here. -- Vincent Povirk

1 0

[1/4 try 3] wined3d: Activate GL context before making any GL calls in stretch_rect_fbo
by Allan Tong 21 Dec '07

21 Dec '07

Third try, this time without the incomplete FBO error in the ddraw tests. With this set of patches, all D3D tests should pass with FBO offscreen rendering. - Allan

1 0

Re: user32: add stub for GetLayeredWindowAttributes
by Dmitry Timoshkov 21 Dec '07

21 Dec '07

"Louis. Lenders" <xerox_xerox2000(a)yahoo.co.uk> wrote: > +BOOL WINAPI GetLayeredWindowAttributes( HWND hWnd,COLORREF* prgbKey, > + BYTE* pbAlpha, DWORD* pdwFlags ) > +{ > + FIXME("(%p,0x%.8x,%d,%d): stub!\n", hWnd, *prgbKey, *pbAlpha, *pdwFlags); > + return TRUE; > +} Probably a better idea would be to return FALSE, otherwise you have to initialize all the requested data. -- Dmitry.

1 0

Re: mapi32: Resolve FIXME regarding attachment lists in MAPISendMailfunction
by Dmitry Timoshkov 21 Dec '07

21 Dec '07

"Mark Neyhart" <Mark_Neyhart(a)legis.state.ak.us> wrote: > diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c > old mode 100644 > new mode 100755 Please fix file permissions before submitting patches. -- Dmitry.

1 0

Re: advapi32: Fix domain length setting in LookupAccountNameW
by Zac Brown 21 Dec '07

21 Dec '07

Zac Brown wrote: > Hi, > > Changelog: > * Fix value setting for *cchReferencedDomainName in LookupAccountNameW > * Fix LookupAccountNameA conversion from WCHAR to CHAR by setting proper '\0' > > Notes: > * This patch addresses bug 10612 > > -Zac Brown > > > ------------------------------------------------------------------------ > > Ignore this patch, it has stupid mistakes in it. Will send a second one thats correct. -Zac

1 0

The #winehq Wine channel
by Andrew Riedi 21 Dec '07

21 Dec '07

There are two main issues I would like to address. 1) Normally the current #winehq OPs to a great job, but they are only human and only have so many waking hours. I noticed recently that it took a little longer than normal for #winehq's topic to be updated to the latest release. I would like to ask for some basic OP rights to update the topic when the regular OPs are unable to, due to real life. Who is in charge of this sort of thing? 2) Rules. Should we provide a set of rules for #winehq use? For general Wine-based channel use? (#winehq, #winehq-social, #winehackers, #crossover) Perhaps state when people deserve a kick, the purposes of each channel, etc. Maybe we should start a wiki page with the information, rules, etc.? -- Andrew Riedi

1 0

Re: [PATCH] Implement BindIoCompletionCallback
by Robert Shearman 20 Dec '07

20 Dec '07

Andrey Turkin wrote: > /****************************************************************************** > * BindIoCompletionCallback (KERNEL32.@) > */ > +extern NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE,LPOVERLAPPED_COMPLETION_ROUTINE,ULONG); > This should go in winternl.h. > BOOL WINAPI BindIoCompletionCallback( HANDLE FileHandle, LPOVERLAPPED_COMPLETION_ROUTINE Function, ULONG Flags) > { > - FIXME("%p, %p, %d, stub!\n", FileHandle, Function, Flags); > - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); > + NTSTATUS status; > + > + TRACE("(%p, %p, %d)\n", FileHandle, Function, Flags); > + > + status = RtlSetIoCompletionCallback( FileHandle, Function, Flags ); > + if (status == STATUS_SUCCESS) return TRUE; > + SetLastError( RtlNtStatusToDosError(status) ); > return FALSE; > } > -- Rob Shearman

8 12

Re: kernel32: Remove unneeded casts
by Robert Shearman 20 Dec '07

20 Dec '07

Andrew Talbot wrote: > /* All local heap allocations are aligned on 4-byte boundaries */ > #define LALIGN(word) (((word) + 3) & ~3) > > -#define ARENA_PTR(ptr,arena) ((LOCALARENA *)((char*)(ptr)+(arena))) > +#define ARENA_PTR(ptr,arena) ((LOCALARENA *)((ptr)+(arena))) Don't remove casts from macros like this as they then won't be safe if the type that is passed in is changed to something else (like void *). -- Rob Shearman

2 1

Re: try2:winefile:Save font settings for registry
by Dmitry Timoshkov 20 Dec '07

20 Dec '07

"Ivan Sinitsin" <ivan(a)etersoft.ru> wrote: > + if( RegQueryValueExW( hKey, reg_logfont, NULL, &type, > + (LPBYTE) &logfont, &size ) != ERROR_SUCCESS ) { > + hFont=GetStockObject(DEFAULT_GUI_FONT); > + GetObject(hFont,sizeof(logfont),&logfont); > + } There is no need to introduce the hFont variable. > + GetObject(Globals.hfont, sizeof(logfont), &logfont); To make the code more readable this call should be moved where logfont is actually used. > + RegSetValueExW( hKey, reg_logfont, 0, REG_DWORD, > + (LPBYTE) &logfont, sizeof(LOGFONT) ); The type should be set to REG_BINARY. -- Dmitry.

2 2

Re: rpcrt4: Fix regression in NdrConformantStringUnmarshall by doing the memcpy check in safe_copy_from_buffer
by Robert Shearman 20 Dec '07

20 Dec '07

Maarten Lankhorst wrote: > @@ -665,7 +665,8 @@ static inline void safe_copy_from_buffer(MIDL_STUB_MESSAGE *pStubMsg, void *p, U > if ((pStubMsg->Buffer + size < pStubMsg->Buffer) || /* integer overflow of pStubMsg->Buffer */ > (pStubMsg->Buffer + size > pStubMsg->BufferEnd)) > RpcRaiseException(RPC_X_BAD_STUB_DATA); > - memcpy(p, pStubMsg->Buffer, size); > + if (p != pStubMsg->Buffer) > + memcpy(p, pStubMsg->Buffer, size); > pStubMsg->Buffer += size; > } > > @@ -890,8 +891,7 @@ unsigned char *WINAPI NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg > *ppMemory = NdrAllocate(pStubMsg, memsize); > } > > - if (*ppMemory != pStubMsg->Buffer) > - safe_copy_from_buffer(pStubMsg, *ppMemory, bufsize); > + safe_copy_from_buffer(pStubMsg, *ppMemory, bufsize); > > if (*pFormat == RPC_FC_C_CSTRING) { > TRACE("string=%s\n", debugstr_a((char*)*ppMemory)); > Good work in spotting and fixing the mistake I made, but I think I'd prefer to fix it by making the caller of safe_copy_from_buffer do the incrementing of the buffer. This is to avoid confusion with the name of the function and to avoid the possibility that the buffer is incremented twice. -- Rob Shearman

2 2

Re: kernel32: invalidate local copy of console input event handle while reallocating console.
by Alexandre Julliard 20 Dec '07

20 Dec '07

"Kirill K. Smirnov" <lich(a)math.spbu.ru> writes: > @@ -378,10 +381,7 @@ BOOL WINAPI CloseConsoleHandle(HANDLE handle) > */ > HANDLE WINAPI GetConsoleInputWaitHandle(void) > { > - static HANDLE console_wait_event; > - > - /* FIXME: this is not thread safe */ > - if (!console_wait_event) > + if (console_wait_event == INVALID_HANDLE_VALUE) 0 and INVALID_HANDLE_VALUE are not the same thing. The correct value to use for invalid events is 0. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: msi: Revert commit 96e4320feb22b3a2c9564de100c09990622edb59
by Mikołaj Zalewski 20 Dec '07

20 Dec '07

> > I have no idea what Mikolaj tried to fix with this patch but As I wrote in http://www.winehq.org/pipermail/wine-patches/2007-October/045479.html the problem was in the Photoshop CS2 installer where the groupbox consumed mouse events. They didn't arrive to the edit box (which was created earlier) what caused it to appear to be disabled. I checked that in that installer the groupbox had the BS_GROUPBOX style. Maybe that depends on some flags? Mikołaj Zalewski

2 1

Re: [patch 1/2, try 2] wined3d: rewrite IWineD3DSurfaceImpl_BltOverride colorfill codepath
by Stefan Dösinger 20 Dec '07

20 Dec '07

Hi Alexander, I had a look at your patches again, and another issue came to my mind: I am not sure how the scissor rectangle and viewport affects ColorFill blits. IDirect3DDevice::Clear is limited by the viewport, the scissor test and the rectangles passed in, but I think that this doesn't apply to ColorFills. If that is true, I think there isn't much point in having a common codepath, and we should just put the glClear() call into COLORFILL itself - Dealing with the differences of those two calls will be more effort than the code shared. But I think we need a test for this. There is a clear() test in dlls/ddraw/tests/visual.c, but the d3d9 test tests a few more things. It should be possible to add a COLORFILL test to the visual.c clear test in ddraw as well, this will show if Windows honors the scissor and viewport in COLORFILL or not. Yes, I know... Start fixing one bug, and you'll run into a lot more. Happens to me all the time as well :-) Stefan

2 1

Re: [5/6] WineD3D: Move the GL info structure into the adapter
by H. Verbeet 20 Dec '07

20 Dec '07

On 20/12/2007, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > +#define WINED3D_ATR_TYPE(type) GLINFO_LOCATION.glTypeLookup[type].d3dType > +#define WINED3D_ATR_SIZE(type) GLINFO_LOCATION.glTypeLookup[type].size > +#define WINED3D_ATR_GLTYPE(type) GLINFO_LOCATION.glTypeLookup[type].glType > +#define WINED3D_ATR_NORMALIZED(type) GLINFO_LOCATION.glTypeLookup[type].normalized > +#define WINED3D_ATR_TYPESIZE(type) GLINFO_LOCATION.glTypeLookup[type].typesize Unrelated to the actual patch, but I think it wouldn't hurt to get rid of these macros. They're pretty much unnecessary.

1 0

Re: The BS_GROUPBOX style should only be used if the HasBorderattribute is set
by Dmitry Timoshkov 20 Dec '07

20 Dec '07

"James Hawkins" <truiken(a)gmail.com> wrote: > Changelog: > * The BS_GROUPBOX style should only be used if the HasBorder attribute is set. Alexandre, please don't apply this patch. I sent another patch that reverts commit 96e4320feb22b3a2c9564de100c09990622edb59 which is the real source of the problem. Perhaps James' patch is going in the right direction when a group box should really be displayed by a WM_DRAWITEM handler, or BS_GROUPBOX should be used instead in that case. But that needs a test case. -- Dmitry.

1 0

Today's git won't hunt. Server crash, lots of other problems?
by Dan Kegel 20 Dec '07

20 Dec '07

On Dec 18, 2007 10:29 AM, Susan Cragin <susancragin(a)earthlink.net> wrote: > My git won't install DNS9P any more, as of today's git. > Any suggestions? > > susan@ubuntu:~/DNS9$ wine setup > fixme:advapi:LookupAccountNameW (null) L"susan" (nil) 0x34b944 (nil) 0x34b948 0x34b93c - stub > fixme:advapi:LookupAccountNameW (null) L"susan" 0x1463f0 0x34b944 0x146998 0x34b948 0x34b93c - stub > fixme:msi:ITERATE_DuplicateFiles We should track these duplicate files as well > fixme:msi:msi_unimplemented_action_stub RemoveFolders -> 2 ignored L"CreateFolder" table values > fixme:advapi:LookupAccountNameW (null) L"susan" (nil) 0x34f7fc (nil) 0x34f800 0x34f7f4 - stub > fixme:advapi:LookupAccountNameW (null) L"susan" 0x1423a0 0x34f7fc 0x13ce80 0x34f800 0x34f7f4 - stub > fixme:atl:AtlModuleInit SEMI-STUB (0x40eb40 0x40c040 0x400000) > wineserver crashed, please enable coredumps (ulimit -c unlimited) and restart. I just ran into that myself. ALVIN!!!!!!!!! But it doesn't seem easy to repeat; I keep getting other errors now. Roy next to me says he ran into another regression, he's doing a bisect, maybe it's the same thing. He should be done shortly. - Dan

3 3

Early wine history
by Dan Kegel 19 Dec '07

19 Dec '07

winehq.org doesn't seem to have a link to the message that launched the wine project, so I went looking. The first message I found contemplating it was dated 1 Jun 1993, http://groups.google.com/group/comp.os.linux/msg/0a7c3867abdb4a76 Is that about the right estimate for Wine's birthday? A roughly 1995 writeup about Wine is at http://www.softlookup.com/tutorial/redhat/rhl58.asp It has a screen shot of a game Pipe Dream running under Wine. I just checked; the game is still online at http://members.chello.at/theodor.lauppert/games/pipe1.htm and runs well on today's wine :-)

4 3

Re: [msiexec] A nicer icon
by Alexandre Julliard 19 Dec '07

19 Dec '07

Hervÿffffe9 Chanal <chanal_herve(a)yahoo.fr> writes: > Hello, > > It's a larger nicer icon for msiexec with the svg source. Having icons in .svg format is a nice improvement, but we'll need a tool to build the .ico from the .svg. We also need to include multiple sizes in the .ico, most places want a 32x32 icon, and scaling down the 48x48 looks bad. Of course we should also look into taking advantage of the larger size where that's possible without breaking compatibility. -- Alexandre Julliard julliard(a)winehq.org

2 1

Piddly little erratic valgrind warning in ole32_moniker
by Dan Kegel 19 Dec '07

19 Dec '07

Nothing really new yesterday or today. This one's annoying: http://kegel.com/wine/valgrind/logs-2007-12-19/vg-ole32_moniker-diff.txt + Syscall param write(buf) points to uninitialised byte(s) + at (within /lib/ld-2.5.so) + by WriteFile (file.c:512) + by RPCSS_BecomePipeServer (np_server.c:379) + by main (rpcss_main.c:101) because it keeps looking like it's new every other day $ grep RPCSS_BecomePipeServer logs-*/vg-ole32_mon*diff.txt logs-2007-12-06/vg-ole32_moniker-diff.txt:+ by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-06/vg-ole32_moniker-diff.txt:+ fun:RPCSS_BecomePipeServer logs-2007-12-06/vg-ole32_moniker-diff.txt:- by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-06/vg-ole32_moniker-diff.txt:- fun:RPCSS_BecomePipeServer logs-2007-12-07/vg-ole32_moniker-diff.txt: fun:RPCSS_BecomePipeServer logs-2007-12-08/vg-ole32_moniker-diff.txt:+ by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-08/vg-ole32_moniker-diff.txt:+ fun:RPCSS_BecomePipeServer logs-2007-12-08/vg-ole32_moniker-diff.txt:- by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-08/vg-ole32_moniker-diff.txt:- fun:RPCSS_BecomePipeServer logs-2007-12-10/vg-ole32_moniker-diff.txt:- by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-10/vg-ole32_moniker-diff.txt:- fun:RPCSS_BecomePipeServer logs-2007-12-10/vg-ole32_moniker-diff.txt:+ by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-10/vg-ole32_moniker-diff.txt:+ fun:RPCSS_BecomePipeServer logs-2007-12-12/vg-ole32_moniker-diff.txt:+ by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-12/vg-ole32_moniker-diff.txt:+ fun:RPCSS_BecomePipeServer logs-2007-12-12/vg-ole32_moniker-diff.txt:- by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-12/vg-ole32_moniker-diff.txt:- fun:RPCSS_BecomePipeServer logs-2007-12-13/vg-ole32_moniker-diff.txt:- by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-13/vg-ole32_moniker-diff.txt:- fun:RPCSS_BecomePipeServer logs-2007-12-14/vg-ole32_moniker-diff.txt:+ by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-14/vg-ole32_moniker-diff.txt:+ fun:RPCSS_BecomePipeServer logs-2007-12-17/vg-ole32_moniker-diff.txt:- by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-17/vg-ole32_moniker-diff.txt:- fun:RPCSS_BecomePipeServer logs-2007-12-17/vg-ole32_moniker-diff.txt:+ by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-17/vg-ole32_moniker-diff.txt:+ fun:RPCSS_BecomePipeServer logs-2007-12-18/vg-ole32_moniker-diff.txt:- by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-18/vg-ole32_moniker-diff.txt:- fun:RPCSS_BecomePipeServer logs-2007-12-19/vg-ole32_moniker-diff.txt:+ by RPCSS_BecomePipeServer (np_server.c:379) logs-2007-12-19/vg-ole32_moniker-diff.txt:+ fun:RPCSS_BecomePipeServer

1 0

Re: Patch for process title on FreeBSD
by Alexandre Julliard 19 Dec '07

19 Dec '07

Kris Moore <kris(a)pcbsd.com> writes: > --- dlls/kernel32/process.c.orig 2007-12-12 12:34:45.000000000 -0500 > +++ dlls/kernel32/process.c 2007-12-12 12:35:17.000000000 -0500 > @@ -853,6 +853,11 @@ > */ > static void set_process_name( int argc, char *argv[] ) > { > + > +#if defined(__FreeBSD__) > + setproctitle("-%s", argv[1]); > +#endif You should add a configure check for this function, instead of checking for __FreeBSD__. -- Alexandre Julliard julliard(a)winehq.org

3 2

Re: [PATCH 2/3] qmgr: AddRef, QueryInterface, and stub functions for queue manager interface.
by Alexandre Julliard 19 Dec '07

19 Dec '07

Roy Shea <roy(a)cs.hmc.edu> writes: > +static ULONG WINAPI BITS_IBackgroundCopyManager_AddRef( > + IBackgroundCopyManager* iface) > +{ > + ICOM_THIS_MULTI(BackgroundCopyManagerImpl, lpVtbl, iface); There's no reason to use ICOM_THIS_MULTI with a single vtbl. > + if (This == NULL) > + { > + return E_POINTER; > + } Checking This for NULL is a waste of time. -- Alexandre Julliard julliard(a)winehq.org

1 0

RE: [PATCH] Implement BindIoCompletionCallback
by Rolf Kalbermatter 19 Dec '07

19 Dec '07

Andrey Turkin wrote: >diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c >index e402fed..7bbb3e2 100644 >--- a/dlls/kernel32/tests/sync.c >+++ b/dlls/kernel32/tests/sync.c >@@ -327,7 +327,7 @@ static void test_iocp_callback(void) > retb = p_BindIoCompletionCallback(hFile, iocp_callback, 0); > ok(retb == FALSE, "BindIoCompletionCallback succeeded on a file that wasn't created with FILE_FLAG_OVERLAPPED\n"); > if(retb == FALSE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { >- todo_wine ok (0, "BindIoCompletionCallback returned ERROR_CALL_NOT_IMPLEMENTED\n"); >+ ok (0, "BindIoCompletionCallback returned ERROR_CALL_NOT_IMPLEMENTED\n"); > return; > } I don't think this check makes much sense after the change anymore. It's at best a skip() for older Windows versions. Rolf Kalbermatter

1 0

[Fwd: Re: About the WWN]
by kubrick＠fgv6.net 19 Dec '07

19 Dec '07

Hello. As indicated by Zachary, I post the suggestion I made him on the wine-devel list. The suggestion was : "what do you think about writing in the WWN an article about what did the last changes of the last release brought? I mean, knowing that there is "a ton of rpcrt4 fixes" or "New Bidi text implementation that doesn't depend on libicu" is really great, but from a user point of view it doesn't mean anything. It would be great if you'd explain us the problems it solves and which opportunities it gives." What he replies is that he need your help ! Thanks. François. ------------------------------------------------------- Original Message ------------------------------------------------------- Subject: Re: About the WWN From: "Zachary Goldberg" <zgold(a)bluesata.com> Date: Tue, December 18, 2007 19:50 To: François Guerraz <kubrick(a)fgv6.net> -------------------------------------------------------------------------------------------------------------------------------- Francois, If you could do me a favor of suggesting your second point on the wine-devel mailing list then we could start a discussion for it. I think it would be a good idea; however It would require perhaps a bit more detail being made in the commit comments to WINE so that I can go through them and put together the real changes. --Zach On Dec 18, 2007 1:47 PM, François Guerraz <kubrick(a)fgv6.net> wrote: > Hello. > > First of all : thank you so much for being the new author of the WWN. I am a > fervent reader and I was really upset that it was almost never written. I > hope you'll find this task interesting and that you won't be fed up with it > too quick :) > Second I have a suggestion to make : what do you think about writing in the > WWN an article about what did the last changes of the last release brought? > I mean, knowing that there is "a ton of rpcrt4 fixes" or "New Bidi text > implementation that doesn't depend on libicu" is really great, but from a > user point of view it doesn't mean anything. It would be great if you'd > explain us the problems it solves and which opportunities it gives. > > Thank you for your time and implication. > > Regards, > > > François Guerraz > kubrick(a)fgv6.net > > > > -- Zachary Goldberg Computer Science & Engineering Electrical Captain of Penn Electric Race Team School of Engineering at the University of Pennsylvania

1 0

Interview with Alexandre on Lug Radio
by Dan Kegel 19 Dec '07

19 Dec '07

http://www.lugradio.org/episodes/90 "Alexandre Juillard from the Wine Project talks about where Wine is, why it isn't finished, and what's coming next (2.02)" In which we learn that Wine now has a release manager, and that the plan is to release 1.0 for the 15th anniversary of the project. - Dan

1 0

Re: ntoskrnl: Implement or add stubs for several functions.
by Dmitry Timoshkov 19 Dec '07

19 Dec '07

"Chris Wulff" <crwulff(a)rochester.rr.com> wrote: > NOTE: This is required for the "hal: Stubs for ExAcquireFastMutex and > ExReleaseFastMutex" patch to build. (it contains the fast mutex > typedefs.) I apologize for submitting them out of order. You need to send every API implementation as a separate self contained patch, and avoid not necessary white space changes. -- Dmitry.

1 0

Re: WineX11.drv: Add an X11 window for the client area [attempt2]
by Chris Robinson 18 Dec '07

18 Dec '07

On Tuesday 18 December 2007 01:52:11 am Roderick Colenbrander wrote: > > This is an updated version of the previous patch. It contains the > > following changes: > > - the client window is set to the whole window in case of the desktop I think you also need to set the desktop hwnd's client_window_prop too, so GetDC and friends will get the right window when not using the DCX_WINDOW flag. > > - the client window is destroyed in SetParent together with the other X11 > > windows In the case of data->whole_window == data->client_window, you should probably make sure the client_window (and it's prop) are both set back to 0, too.

1 0

DTrace instrumentation
by Damian Wojsław 18 Dec '07

18 Dec '07

Hi I have an idea that I can put some time into. Since Leopard, FreeBSD and, of course, Solaris, now all have DTrace, I thought of implementing some simple probes. Function entry/return for starters. However, I'd firstly need to know two things: - would anyone be interested in it? - would it be legal (it wold link with dtrace library, which on Solaris is CDDL). Regards -- Damian Wojsław OpenSolaris Core Contributor SCA No. OS00073

2 1

Re: gdi32: Add a GdiConvertToDevmodeW test, make it pass under Wine
by Robert Shearman 18 Dec '07

18 Dec '07

Dmitry Timoshkov wrote: > DEVMODEW *dmW; > WORD dmW_size; > > - dmW_size = dmA->dmSize + CCHDEVICENAME; > - if (dmA->dmSize >= (const char *)dmA->dmFormName - (const char *)dmA + CCHFORMNAME) > + dmW_size = dmA->dmSize; > + if (dmW_size > sizeof(DEVMODEA)) > + dmW_size = sizeof(DEVMODEA); > Shouldn't this be sizeof(DEVMODEW)? > + > + dmW_size += CCHDEVICENAME; > Shouldn't this be CCDEVICENAME * sizeof(WCHAR)? > + if (dmA->dmSize >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) > dmW_size += CCHFORMNAME; > Shouldn't this be CCHFORMNAME * sizeof(WCHAR)? -- Rob Shearman

2 1

Re: [10/10] WineD3D: Implement blits from the active render target to swapchains
by Stefan Dösinger 18 Dec '07

18 Dec '07

Am Montag, 17. Dezember 2007 21:04:46 schrieb Stefan Dösinger: Do not apply this patch yet, it has some problems

2 1

Re: WineX11.drv: Add an X11 window for the client area [attempt2]
by Roderick Colenbrander 18 Dec '07

18 Dec '07

By accident I discovered that with this patch the wine desktop window doesn't work properly if there are multiple windows around (you notice redrawing issues). I haven't seen those before, so there is something wrong in this patch but I don't know where to look (I guess it is the client_window = whole_window code). Roderick > The previous patch accidently undid one of Stefan's changes and prevented > it from compiling. This patch should be fine. > > Roderick > > > > Hi, > > > > This is an updated version of the previous patch. It contains the > > following changes: > > - the client window is set to the whole window in case of the desktop > > - NortWestGravity is used when creating the client window > > - the client window is destroyed in SetParent together with the other > X11 > > windows > > > > The patch was tested using the user32 tests and various opengl / d3d > test > > apps. All worked correctly. > > > > Regards, > > Roderick Colenbrander > > > > -- > > GMX FreeMail: 1 GB Postfach, 5 E-Mail-Adressen, 10 Free SMS. > > Alle Infos und kostenlose Anmeldung: http://www.gmx.net/de/go/freemail > > -- > GMX FreeMail: 1 GB Postfach, 5 E-Mail-Adressen, 10 Free SMS. > Alle Infos und kostenlose Anmeldung: http://www.gmx.net/de/go/freemail -- Ist Ihr Browser Vista-kompatibel? Jetzt die neuesten Browser-Versionen downloaden: http://www.gmx.net/de/go/browser

1 0

Re: wined3d: Bind device framebuffer in ActivateContext
by Stefan Dösinger 18 Dec '07

18 Dec '07

Am Sonntag, 25. November 2007 00:07:15 schrieb Allan Tong: > Fixes failures in visual tests for ddraw and d3d8 when using FBO > offscreen rendering mode. > > - Allan This doesn't look right to me. It will most likely break overall FBO support. There is indeed a problem with the fbo and ActivateContext integration, but fixing this is more involved than just setting the framebuffer to 0.

4 9

Vector NTI on Mac, WinHelp improvements
by Misha Koshelev 18 Dec '07

18 Dec '07

Hi guys, It's been a bit since I wrote to the list (or contributed anything... been somewhat busy I guess with lab/school/life). Anyhow I just wanted to acknowledge the new WinHelp fixes (Kirill thanks in particular). Although there is still no Contents or Search, which would make the Vector NTI help more usable, the bug where it would complain about not being able to open help when it was requested even though help would open just fine has now been fixed. Thanks! Also, I've been starting to play some with Wine on Mac and may in time end up contributing some patches for this goal, provided I will have to acquaint myself with some more Mac specific coding ideas first. Specifically though, I'd like to point out that I think the Mac is a hugely important platform for Wine I believe in terms of end-user adoption, and although I understand the rationale for not having binary packages available because Apple's X11 is buggy (which it clearly is), I think it would still be nice to have the Mac at least be an important focus. And yes my thought initially was "well there's usually a Mac version of the Windows program." But alas unfortunately this seems to not quite be the case a lot of times. For example, even Vector NTI, which has both "mac and windows" versions, actually has a Mac version that does not work on MacOS 10.4 and higher (the company reports they are working on a code rewrite for Mac versions, but meanwhile there are tons of people out there on Google looking for ways around this/alternatives as Vector NTI is very common in molecular biology and Macs are traditionally the platform of choice in the field)... Wine would find a very nice niche here with a bunch of people that otherwise prob would not end up using it. Another program we use a lot, Kodak Molecular Imaging, also actually has problems with MacOS 10.4+ on Intel (not PowerPC) Macs, although this has to do with the dongle drivers (USB dongle = Sentinel SuperPro), so likely Wine would need a little more improvement to be of use here. Anyway, just wanted to point out my observations about the Mac and that although others might be thinking along the same lines I was... "well most programs available for Windows are available for Mac", in two examples I've discovered that upon careful examination this actually turns out to be quite opposite of the actual case. Thanks for you time Misha

1 0

Re: msi [2/2]: Sort each table of the join separately
by James Hawkins 18 Dec '07

18 Dec '07

On Dec 17, 2007 7:35 PM, James Hawkins <truiken(a)gmail.com> wrote: > Hi, > > This is another fix for the National Instruments LabView mega-installer. > > Changelog: > * Sort each table of the join separately. > Oops, ignore this patch (first one can go in). I forgot to add the freeing code for the order. I'll have to resend it tomorrow. -- James Hawkins

1 0

New valgrind regressions in riched20, rpcrt4
by Dan Kegel 17 Dec '07

17 Dec '07

http://kegel.com/wine/valgrind/logs-2007-12-17-summary.txt shows interesting things happened since Friday in riched20. See http://kegel.com/wine/valgrind/logs-2007-12-17/vg-riched20_editor-diff.txt for a whole heap of new errors. The only change since Friday was Maarten's, http://www.winehq.org/pipermail/wine-cvs/2007-December/038829.html, which seems somewhat unrelated, maybe he's getting slagged unfairly here. (But it would still be nice if he could have a look.) There's also the somewhat questionable new warning + Source and destination overlap in memcpy(0x7F00F844, 0x7F00F844, 22) in http://kegel.com/wine/valgrind/logs-2007-12-17/vg-rpcrt4_ndr_marshall-diff.… which would be Rob's if it turns out to be a real problem. - Dan

2 1

[Fwd: Re: New bugzilla components.]
by James McKenzie 17 Dec '07

17 Dec '07

-------- Original Message -------- Subject: Re: New bugzilla components. Date: Sun, 16 Dec 2007 18:52:40 -0700 From: James McKenzie <jjmckenzie51(a)sprintpcs.com> To: Dmitry Timoshkov <dmitry(a)codeweavers.com> References: <47640A28.7080701(a)kievinfo.com> <004f01c83f9a$cae2e500$a600fea9@DMITRY> <22821af30712152034t1ee5318ai38eba71df919d38f(a)mail.gmail.com> <200712160933.09187.kai.blin(a)gmail.com> <001101c83fcc$2b6cd490$a600fea9@DMITRY> Dmitry Timoshkov wrote: > > Users are not supposed to set a category the bug belongs to, this requires > an investigation and knowledge of a developer. Personally I'd prefer to have > "default" in the list instead of "wine-misc". > > Better choice: Unknown or intial report. This will allow a user to file a bug without having to get technical. This also allows bug triage and for the appropriate developer or development team to be notified of a new bug. As to listing each and every dll, that would be a mess. Keep it to components and parts and use keywords if necessary to identify offending dlls. James McKenzie

3 3

Re: Unimplemented function KERNEL32.dll.FindFirstVolumeW
by devzero＠web.de 17 Dec '07

17 Dec '07

mhhh - since it cost me more then one hour to find out why my machine reboots and triggering a reboot by just _reading_ a file on my system, device node or not is at least very weird behaviour from a user`s perspective. >waiting for an user-space daemon to start handling of /dev/watchdog file (opening it and manipulating it from time to time to show that it's still alive. >When you cat the file, kernel recognizes it as that such an app is taking over control of the watchdog and starts it. it`s looks a little bit too simple for me. triggering a reboot just by some simple open() and read() and close() ? let`s wait what the maintainer has to tell. regards roland > Hi! > I think it's not a bug, it's a normal behaviour. > The kernel watchdog is normally not active when the machine is booted, > waiting for an user-space daemon to start handling of /dev/watchdog file > (opening it and manipulating it from time to time to show that it's still > alive). When you cat the file, kernel recognizes it as that such an app > is taking over control of the watchdog and starts it. However, because > cat closes the file immediately, it is not handled anymore and kernel > recognizes it as a userspace problem, thus rebooting the machine after > the timeout expires. > With regards, Pavel Troller > > -----Ursprüngliche Nachricht----- > Von: Pavel Troller <patrol(a)sinus.cz> > Gesendet: 20.11.07 08:49:53 > An: devzero(a)web.de > CC: Hans Leidekker <hans(a)it.vu.nl>, wine-devel(a)winehq.org > Betreff: Re: Unimplemented function KERNEL32.dll.FindFirstVolumeW > > > i`ve tracked this down to a watchdog issue. > > > > whenever i do "cat /dev/watchdog" - my system reboots after ~1 minute. > > > > i`ve contacted the maintainer of the watchdog subsystem. > > > > looks like a bug to me. > > > > thanks > > roland > > > Hi! > I think it's not a bug, it's a normal behaviour. > The kernel watchdog is normally not active when the machine is booted, > waiting for an user-space daemon to start handling of /dev/watchdog file > (opening it and manipulating it from time to time to show that it's still > alive). When you cat the file, kernel recognizes it as that such an app > is taking over control of the watchdog and starts it. However, because > cat closes the file immediately, it is not handled anymore and kernel > recognizes it as a userspace problem, thus rebooting the machine after > the timeout expires. > With regards, Pavel Troller > ______________________________________________________________________________ Jetzt neu! Im riesigen WEB.DE Club SmartDrive Dateien freigeben und mit Freunden teilen! http://www.freemail.web.de/club/smartdrive_ttc.htm/?mc=021134

3 2

Re: Unimplemented function KERNEL32.dll.FindFirstVolumeW
by devzero＠web.de 17 Dec '07

17 Dec '07

> Yes, Wine shouldn't be able to do that. You're not running Wine > as root are you? whoops - i did. shame on me :) i retried with ordinary account and the crash didn`t happen there. anyway - should i expect such problems with root ? >Does your system log reveal anything about the crash? no, unfortunately not regards roland > -----Ursprüngliche Nachricht----- > Von: "Hans Leidekker" <hans(a)it.vu.nl> > Gesendet: 19.11.07 21:22:20 > An: "http://freemail.web.de/" <devzero(a)web.de> > Betreff: Re: Unimplemented function KERNEL32.dll.FindFirstVolumeW > > On Monday 19 November 2007 20:59:46 devzero(a)web.de wrote: > > > when scannnig trough drive z:\ , my notebook reboots ! > > wasn`t wine a userspace application with no kernel related stuff ? > > so it`s weird, that windirstat is crashing my notebook, isn`t it ? > > Yes, Wine shouldn't be able to do that. You're not running Wine > as root are you? Does your system log reveal anything about the crash? > > -Hans > ______________________________________________________________________ XXL-Speicher, PC-Virenschutz, Spartarife & mehr: Nur im WEB.DE Club! Jetzt testen! http://produkte.web.de/club/?mc=021130

3 2

Re: WineX11.drv: create X11 window for client area 1/3
by Alexandre Julliard 17 Dec '07

17 Dec '07

"Roderick Colenbrander" <thunderbird2k(a)gmx.net> writes: > + { > + escape.drawable = X11DRV_get_client_window( top ); > + if(!escape.drawable) > + escape.drawable = X11DRV_get_whole_window( top ); You shouldn't need that test, all windows should have a client window; otherwise you have to tell the server about it too. > +static Window create_client_window( Display *display, struct x11drv_win_data *data) > +{ > + RECT rect = data->whole_rect; > + XSetWindowAttributes attr; > + > + OffsetRect( &rect, -data->whole_rect.left, -data->whole_rect.top ); > + data->client_rect = rect; > + > + attr.event_mask = ExposureMask; > + attr.bit_gravity = ForgetGravity; ForgetGravity is wasteful, you should use NorthWestGravity and compute the proper valid rects in SetWindowPos. ForgetGravity may be appropriate for the non-client area though. > @@ -1582,6 +1646,7 @@ void X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) > { > /* FIXME: we ignore errors since we can't really recover anyway */ > create_whole_window( display, data, GetWindowLongW( hwnd, GWL_STYLE ) ); > + create_client_window( display, data ); You need to destroy the client window in SetParent too. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: RESUBMIT [PATCH] enumerate processes in reverse
by Alexandre Julliard 17 Dec '07

17 Dec '07

Marcus Meissner <marcus(a)jet.franken.de> writes: > A game does: > Process32First(); > while (Process32First()) { > /* look for stuff */ > } > completely missing the first process. Unfortunately it > is looking for its own child, which gets missed. > > -> reverse enumerate processes > > Also with testcase. > > (I mailed this 4 weeks ago already, any comments?) Are you sure the order is supposed to be reversed between kernel32 and ntdll? That feels a bit strange. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2] qmgr: Stub functions for queue manager interface.
by Alexandre Julliard 17 Dec '07

17 Dec '07

Roy Shea <roy(a)cs.hmc.edu> writes: > --- > dlls/qmgr/Makefile.in | 1 + > dlls/qmgr/qmgr.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++ > dlls/qmgr/qmgr.h | 38 ++++++++++++++++++ > 3 files changed, 142 insertions(+), 0 deletions(-) Sending small patches is good, but they still need to do something useful. So for a stub interface you should at least implement AddRef and Release, and a way to create an instance. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [3/5] wined3d: create IWineD3DDeviceImpl_ClearSurface routine
by Stefan Dösinger 17 Dec '07

17 Dec '07

Am Montag, 17. Dezember 2007 04:56:14 schrieb Alexander Dorofeyev: > --- > dlls/wined3d/device.c | 162 > ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | > 3 + > 2 files changed, 165 insertions(+), 0 deletions(-) This patch, and 4 and 5 look good to me content wise, but patch 3 doesn't make much sense without either 4 or 5. It's up to AJ to decide, but you could propably combine patches 3 and 4(and keep 5 separate).

2 1

ENTER_GL and ActivateContext question
by Alexander Dorofeyev 17 Dec '07

17 Dec '07

Hello. I was recently experimenting with a fix that involved ActivateContext and needed to figure out whether it is ok if ActivateContext is called inside ENTER_GL()... LEAVE_GL() (also if recursive ENTER_GL is ok). At first I tried to look for example code in wined3d/surface.c, which seemed to indicate this is ok, because it obviously seems to happen in one or few places. Then I found this http://bugs.winehq.org/show_bug.cgi?id=9810 from which it seems it is sort of a bug(?). Can any of 3d guys here clarify this matter - how bad is ActivateContext between ENTER_GL/LEAVE_GL and recursive ENTER_GL, does it definitely need to be avoided and should things like this ENTER_GL(); ... IWineD3DSurface_BindTexture(); ... LEAVE_GL(); (BindTexture does ActivateContext and ENTER_GL) be changed to something like ENTER_GL() ... LEAVE_GL() IWineD3DSurface_BindTexture(); ENTER_GL() ... LEAVE_GL() and submitted as patch if I find it?

6 13

Re: [Wine] crash running Myst
by James McKenzie 17 Dec '07

17 Dec '07

David Griffith wrote: > I'm trying to run Myst (masterpiece edition). By upgrading Wine to .51, > I've gotten the install to finish without complaint. When I attempt to > run Myst, the following is written to the terminal: > > $ wine Myst.exe > fixme:mixer:ALSA_MixerInit No master control found on MPU-401 UART, > disabling mixer > wine: Unhandled page fault on write access to 0x00150000 at address > 0xb7d75cbc (thread 0009), starting debugger... > First chance exception: page fault on write access to 0x00150000 in 32-bit > code (0xb7d75cbc). > > After that comes a register dump, stack dump, and 28 lines of backtrace. > Where do I go from here? > > > File a bug report AFTER searching for problems with Myst. If you find an existing problem, add your information and the bug logs, zipped if they are large >.5 MB. If you can, vote on an existing problem. James McKenzie

3 2

Re: [Wine] Problems with the console functions?
by James McKenzie 17 Dec '07

17 Dec '07

Reijo T Sund wrote: > Dear Wine-experts, > > I've tested the functionality of simple CUI-applications with > wineconsole (Wine-0.9.50, Ubuntu 7.10). Somewhat surprisingly, > there seems to be numerous major flaws in the current > implementation. > > The best (worst?) example is the widely distributed sample code > ("Console: Demonstration of the Console Functions") available in > the MSDN library (http://msdn2.microsoft.com/en-us/library/aa263818.aspx). > > With this code it is easy to replicate the "missing output" bug > (http://bugs.winehq.org/show_bug.cgi?id=10404) and demonstrate several > other previously unreported bugs and crashes. In fact, these problems > seem to prevent the sound running of virtually all CUI-applications > utilizing console functions. > Please add your results to this bug and vote on it. > Should there be one big bug report for this sample console application > or a separate report for each defect? > One bug/defect -> One report. Attach logs/output. And please do a through search of Bugzilla before reporting. > I also wonder if someone else could test whether these potential > problems are real, and confirm that no simple solutions are available.. > Please add as much information to reproduce in the bug reports. If they require downloading large packages, please be aware that some are bandwidth restricted. > The actual sources are available in the full PSDK sample package > downloadable from: > http://download.microsoft.com/download/vstudio60pro/Utility/6.0/W98NT42KMeX…. > > As that is a quite large file (131Mb), the example of interest extracted > from the package is temporarily available at > http://www.helsinki.fi/~sund/sdk_WinUI_console.exe, > or in a zipped form at http://www.helsinki.fi/~sund/console_vs6.zip. > An older (vs97) version of the same SDK sample that includes a compiled > binary can be found at http://www.helsinki.fi/~sund/console_vs97.zip. > Please put these links in the bug reports. Not many are going to download possibly damaging code from your site, however. The sources maybe all that are needed. James McKenzie

1 0

New bugzilla components.
by Vitaliy Margolen 16 Dec '07

16 Dec '07

Please add these new components: wine-vdm - Wine 16-bit compatibility layer wine-comdlg - Common dialogs such as open/save/print/font Vitaliy.

8 26

Re: WineX11.drv: create X11 window for client area 1/3
by Dmitry Timoshkov 16 Dec '07

16 Dec '07

"Roderick Colenbrander" <thunderbird2k(a)gmx.net> wrote: > This patch creates an X11 window for the client area. The code is inspired > by old x11drv of which even a few pieces got copied over. Further Chris > Robinson assisted with positioning issues. > > After this patch most remnants of bug 2398 should be fixed, so both Direct3D > and OpenGL apps should work fine in windowed mode (except for programs which > use their own window rendering code). Did you run the dlls/user32/tests with your patches applied? -- Dmitry.

2 1

Re: [2/5] wined3d: fix broken link in comment
by Stefan Dösinger 16 Dec '07

16 Dec '07

Am Montag, 17. Dezember 2007 04:56:09 schrieb Alexander Dorofeyev: > --- > dlls/wined3d/device.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) I actually removed a bunch of links like that some time ago, I think we can just remove that as well. The source isn't a link collection, and keeping the links up to date would need constant monitoring of the msdn.

1 0

Re: [2/5] wined3d: fix broken link in comment
by H. Verbeet 16 Dec '07

16 Dec '07

On 17/12/2007, Alexander Dorofeyev <alexd4(a)inbox.lv> wrote: > --- > dlls/wined3d/device.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > MSDN URLs should generally just be removed. They change too often to be of any use anyway.

1 0

Re: Clear padding in the buffer due to alignment.
by Dmitry Timoshkov 16 Dec '07

16 Dec '07

"Robert Shearman" <rob(a)codeweavers.com> wrote: > This isn't done in MIDL, but I think it's desirable both for silencing > Valgrind warnings and for security purposes (fixes potential for leaking > information to remote computers or other processes). > + print_file(file, indent, "memset(_StubMsg.Buffer, 0, ((long)_StubMsg.Buffer) & 0x%x);\n", alignment - 1); Is it possible to make it 64-bit and Wine/Windows compatible by using ULONG_PTR instead of long? -- Dmitry.

2 3

COM
by Adelle Hartley 16 Dec '07

16 Dec '07

Hi all, I have some COM DLLs which work fine with VB6 applications on wine. Is it possible to instantiate a windowsy COM object from a linuxy application written in some form of C++ (eg, for compilation with gcc)? Adelle.

2 1

Re: winex11.drv deadkey handling and games
by Dmitry Timoshkov 16 Dec '07

16 Dec '07

"F Capela" <darkwalker_(a)yahoo.com> wrote: > A small fix to those who play games using keyboard layouts with > deadkeys. Patch generated against 0.9.51 release. > Wine currently don't pass keypress events to the windows executable > when the keypress is either a deadkey or follows a deadkey. This makes > it impossible to use any of those keys with games that use WM_KEYDOWN > events to track keypresses - two examples are Guild Wars and World of > Warcraft. > This patch modifies dlls/winex11.drv/event.c to send all keypresses to > the client, and dlls/winex11.drv/keyboard.c to implement a WM_KEYDOWN > translation cache in order to correctly treat them as keys or deadkeys > and keep text input with deadkeys working. > Only tested with Notepad and Guild Wars. > This is my first patch; don't hesitate to point any problems. This hack completely breaks native dead keys support on the X11 side. First thing to do is to write a test case which replicates the behaviour you would like to fix. -- Dmitry.

1 0

Wine and LD_PRELOAD
by Lionel Tricon 15 Dec '07

15 Dec '07

Hi wine list, I am currently working for the next generation of the klik project (1 application = 1 file) and we actualy face some troubles with picasa which is running under linux thanks to wine. It seems that wine deal badly with the LD_PRELOAD feature which is one of the main composant we use to virtualize and execute the application (with fuse for the underlying filesystem). Is there a way to force wine to go through LD_PRELOAD (to overload some system calls) ? or this limitation is driven by the architecture ? Thanks in advance, Lionel Tricon

5 5

Re: [5/5] gdi: Test bitmap depths
by Jesse Allen 15 Dec '07

15 Dec '07

This is good since 15-bpp DIB is not supported in my DIB engine. As it is right now, the 15-bit DIB stuff in winex11/gdi is not really correct (even if it might work). On Dec 11, 2007 1:31 PM, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > > > > >

3 4

Re: [PATCH] dinput: mouse.c: extracted the warping code into a function, got rid from goto's in alloc_device, and made the code more readable. (no change in functionality)
by Vitaliy Margolen 15 Dec '07

15 Dec '07

First of all your patch is wrapped. Second, do not send white space changes only. Same for formatting - do not change formatting only. If you can't read it, reformat for yourself, or get used to reading some one else's code. What's wrong with gotos? If you don't like it doesn't mean everyone else can't use them. Don't change that part. Copying 10 lines of code into 10 places doesn't justify removing 10 lines of code. You should probably check the patch requirements: http://winehq.org/site/sending_patches Vitaliy. Adam Rimon wrote: > --- > > dlls/dinput/mouse.c | 415 > +++++++++++++++++++++++++++++---------------------- > 1 files changed, 235 insertions(+), 180 deletions(-) >

4 5

re: winex11.drv:clipboard.c: Adds zero to the end of string.
by Dan Kegel 15 Dec '07

15 Dec '07

Anatoly wrote: > We do it to make sure that the strings will terminate by zero. What bug does this fix? Can you add a conformance test? - Dan

1 0

Tracking down missing controls (drawn)
by Alistair Leslie-Hughes 14 Dec '07

14 Dec '07

Hi, I've manage to get MS Money 2008 loading there sample file, (with some help from Juan). The next issue is trying to get the information to display correctly. The first image is the one currently running in WINE, and the second is within WinXP http://members.dodo.com.au/~lesliehughes/MS_Money2008.png http://members.dodo.com.au/~lesliehughes/Msmoney2008real.PNG As you can see the control at the bottom doesnt display as it should. Where can I start to look to workout how to get this control(s) to display correctly? Best Regards Alistair Leslie-Hughes

2 2

Re: msi: Fix an off-by-one error
by James Hawkins 14 Dec '07

14 Dec '07

On Dec 14, 2007 3:18 PM, James Hawkins <truiken(a)gmail.com> wrote: > Hi, > > Changelog: > * Fix an off-by-one error. > Please ignore this patch. This whole function needs to be rewritten. -- James Hawkins

1 0

msi valgrind regression around Dec 4th
by Dan Kegel 14 Dec '07

14 Dec '07

This error Conditional jump or move depends on uninitialised value(s) at ACTION_AppSearchSigName (appsearch.c:435) by ITERATE_CCPSearch (appsearch.c:916) by MSI_IterateRecords (msiquery.c:190) by ACTION_CCPSearch (appsearch.c:943) by ACTION_HandleStandardAction (action.c:974) by ACTION_PerformUIAction (action.c:1042) by MsiDoActionW (install.c:108) by MsiDoActionA (install.c:56) by test_ccpsearch (package.c:4954) by func_package (package.c:5384) by run_test (test.h:387) by main (test.h:436) appeared between Nov 30 and Dec 4, and is still present in today's, http://kegel.com/wine/valgrind/logs-2007-12-14/vg-msi_package.txt I pinged James about it and a few others on Dec 5th; he seems to have fixed the others, but this one remains. - Dan

2 1

docu - broken links
by Rico Schüller 14 Dec '07

14 Dec '07

Hi, while I was looking in the docu (html) I found some links that are broken. In some cases these are typos, in other I don't know. Here is a list width broken links, I've found. I would like to fix this. But I don't know which one are typos and which one are broken because the function which is referred to isn't documented. This is e.g. a typo I think: file ChosseFontW.html in ChooseFontA.html not found. *** ChosseFontW.html -> ChooseFontW.html Could someone with more knowledge take a look at this list and say which one are typos? Regards Rico file ICreateTypeInfo_AddRefTypeInfo.html in ICreateTypeInfo2_AddRefTypeInfo.html not found. file SHGetFileInfoW.html in SHGetFileInfoWrapW.html not found. file ITypeLib_GetTypeInfoType.html in ITypeLib2_GetTypeInfoType.html not found. file EnumCalendarInfoAW.html in EnumCalendarInfoA.html not found. file _findnext.html in MSVCRT__findnexti64.html not found. file SetCurrentDirectoryA.html in _chdrive.html not found. file CreateDirectoryA.html in MSVCRT__mkdir.html not found. file ITypeInfo_GetVarDesc.html in ITypeInfo2_GetVarDesc.html not found. file ShellExecuteExW.html in ShellExecuteExWrapW.html not found. file SHBrowseForFolderW.html in SHBrowseForFolderWrapW.html not found. file IUnknown_AddRef.html in IQueryAssociations_AddRef.html not found. file GetColorDirectoryW.html in GetColorDirectoryA.html not found. file IUnknown_QueryInterface.html in ITypeInfo2_QueryInterface.html not found. file ICreateTypeLib_SetName.html in ICreateTypeLib2_SetName.html not found. file ICreateTypeLib_SaveAllChanges.html in ICreateTypeLib2_SaveAllChanges.html not found. file EnumCalendarInfoAW.html in EnumCalendarInfoW.html not found. file IUnknown_Release.html in IQueryAssociations_Release.html not found. file UserUnInstStubWrapperW.html in UserUnInstStubWrapperA.html not found. file IUnknown_AddRef.html in ICreateTypeInfo2_AddRef.html not found. file SHLWAPI_183.html in SHRegisterClassW.html not found. file ICreateTypeLib_SetGuid.html in ICreateTypeLib2_SetGuid.html not found. file ITypeLib_GetTypeInfo.html in ITypeLib2_GetTypeInfo.html not found. file FindNextFileA.html in MSVCRT__findnext.html not found. file ICreateTypeInfo_SetVersion.html in ICreateTypeInfo2_SetVersion.html not found. file SysAllocStringByteLen16.html in SysReAllocStringLen16.html not found. file EnumCalendarInfoAW.html in EnumCalendarInfoExW.html not found. file ICreateTypeLib_SetLibFlags.html in ICreateTypeLib2_SetLibFlags.html not found. file ICreateTypeInfo_SetFuncAndParamNames.html in ICreateTypeInfo2_SetFuncAndParamNames.html not found. file GetFileVersionInfoW.html in GetFileVersionInfoWrapW.html not found. file ICreateTypeInfo_SetSchema.html in ICreateTypeInfo2_SetSchema.html not found. file IUnknown_AddRef.html in UlAddRef.html not found. file _rmdir.html in _wrmdir.html not found. file IUnknown_QueryInterface.html in ITypeLib2_QueryInterface.html not found. file NtDeleteKey.html in RtlpNtMakeTemporaryKey.html not found. file ICreateTypeInfo_SetGuid.html in ICreateTypeInfo2_SetGuid.html not found. file _findfirst.html in MSVCRT__findfirsti64.html not found. file _chdir.html in _wchdir.html not found. file CreatMailslotW.html in CreateMailslotA.html not found. file ICreateTypeInfo_AddImplType.html in ICreateTypeInfo2_AddImplType.html not found. file DragQueryFileW.html in DragQueryFileWrapW.html not found. file ITypeInfo_GetMops.html in ITypeInfo2_GetMops.html not found. file SSHAnsiToAnsi.html in SHUnicodeToUnicode.html not found. file ITypeLib_IsName.html in ITypeLib2_IsName.html not found. file ICreateTypeLib_SetHelpFileName.html in ICreateTypeLib2_SetHelpFileName.html not found. file IUnknown_QueryInterface.html in IQueryAssociations_QueryInterface.html not found. file RemoveDirectoryA.html in MSVCRT__rmdir.html not found. file IUnknown_QueryInterface.html in IDispatch_QueryInterface.html not found. file IUnknown_Release.html in ITypeInfo2_Release.html not found. file SetCurrentDirectoryA.html in MSVCRT__chdir.html not found. file AddPrinterDriverExW.html in AddPrinterDriverExA.html not found. file ITypeInfo_ReleaseVarDesc.html in ITypeInfo2_ReleaseVarDesc.html not found. file SHFileOperationW.html in SHFileOperationWrapW.html not found. file ExtractIconW.html in ExtractIconWrapW.html not found. file NtOpenProcessToken.html in OpenProcessToken.html not found. file ICreateTypeInfo_SetVarDocString.html in ICreateTypeInfo2_SetVarDocString.html not found. file ICreateTypeInfo_SetImplTypeFlags.html in ICreateTypeInfo2_SetImplTypeFlags.html not found. file FileSaveRestoreOnINFW.html in FileSaveRestoreOnINFA.html not found. file _findnext.html in MSVCRT__wfindnext.html not found. file BitBlt16.html in WinGBitBlt16.html not found. file IUnknown_QueryInterface.html in ICreateTypeLib2_QueryInterface.html not found. file _mkdir.html in _wmkdir.html not found. file PlaySoundW.html in PlaySoundWrapW.html not found. file ITypeInfo_GetTypeComp.html in ITypeInfo2_GetTypeComp.html not found. file IUnknown_Release.html in UlRelease.html not found. file ICreateTypeInfo_SetMops.html in ICreateTypeInfo2_SetMops.html not found. file ITypeInfo_GetDocumentation.html in ITypeInfo2_GetDocumentation.html not found. file ICreateTypeInfo_SetFuncDocString.html in ICreateTypeInfo2_SetFuncDocString.html not found. file WNetRestoreConnectionW.html in WNetRestoreConnectionWrapW.html not found. file ITypeInfo_GetTypeAttr.html in ITypeInfo2_GetTypeAttr.html not found. file GetFileVersionInfoSizeW.html in GetFileVersionInfoSizeWrapW.html not found. file FindFirstFileA.html in MSVCRT__findfirst.html not found. file ICreateTypeInfo_SetAlignment.html in ICreateTypeInfo2_SetAlignment.html not found. file NtCreateKey.html in RtlpNtCreateKey.html not found. file ICreateTypeInfo_SetDocString.html in ICreateTypeInfo2_SetDocString.html not found. file ICreateTypeLib_SetLcid.html in ICreateTypeLib2_SetLcid.html not found. file IUnknown_Release.html in IDispatch_Release.html not found. file SysAllocStringByteLen16.html in SysAllocStringLen16.html not found. file ICreateTypeLib_SetVersion.html in ICreateTypeLib2_SetVersion.html not found. file _findfirst.html in MSVCRT__wfindfirst.html not found. file EnumCalendarInfoAW.html in EnumCalendarInfoExA.html not found. file IUnknown_Release.html in ITypeLib2_Release.html not found. file NtOpenKey.html in RtlpNtOpenKey.html not found. file ITypeInfo_GetIDsOfNames.html in ITypeInfo2_GetIDsOfNames.html not found. file SHDefExtractIconW.html in SHDefExtractIconWrapW.html not found. file ITypeInfo_GetRefTypeInfo.html in ITypeInfo2_GetRefTypeInfo.html not found. file NtOpenThreadToken.html in OpenThreadToken.html not found. file ldap_memfreeW.html in ldap_memfreeA.html not found. file ITypeInfo_GetRefTypeOfImplType.html in ITypeInfo2_GetRefTypeOfImplType.html not found. file EnableScrollBar.html in FlatSB_EnableScrollBar.html not found. file ICreateTypeInfo_SetTypeFlags.html in ICreateTypeInfo2_SetTypeFlags.html not found. file ICreateTypeLib_SetHelpContext.html in ICreateTypeLib2_SetHelpContext.html not found. file NtAdjustPrivilegesToken.html in AdjustTokenPrivileges.html not found. file AddPrinterDriverW.html in AddPrinterDriverA.html not found. file IUnknown_AddRef.html in ICreateTypeLib2_AddRef.html not found. file _findnexti64.html in MSVCRT__wfindnexti64.html not found. file ITypeLib_GetTypeInfoOfGuid.html in ITypeLib2_GetTypeInfoOfGuid.html not found. file ITypeInfo_ReleaseTypeAttr.html in ITypeInfo2_ReleaseTypeAttr.html not found. file ICreateTypeInfo_SetVarName.html in ICreateTypeInfo2_SetVarName.html not found. file ITypeLib_GetLibAttr.html in ITypeLib2_GetLibAttr.html not found. file _findfirsti64.html in MSVCRT__wfindfirsti64.html not found. file ChosseFontW.html in ChooseFontA.html not found. file ITypeInfo_GetContainingTypeLib.html in ITypeInfo2_GetContainingTypeLib.html not found. file IUnknown_AddRef.html in IDispatch_AddRef.html not found. file ITypeInfo_GetImplTypeFlags.html in ITypeInfo2_GetImplTypeFlags.html not found. file NtQueryInformationToken.html in GetTokenInformation.html not found. file CopyEnhMetaFileA.html in CopyEnhMetaFileW.html not found. file WNetGetLastErrorW.html in WNetGetLastErrorWrapW.html not found. file ICreateTypeInfo_SetFuncHelpContext.html in ICreateTypeInfo2_SetFuncHelpContext.html not found. file ICreateTypeInfo_LayOut.html in ICreateTypeInfo2_LayOut.html not found. file FindClose.html in MSVCRT__findclose.html not found. file IUnknown_AddRef.html in ITypeInfo2_AddRef.html not found. file IUnknown_Release.html in ICreateTypeInfo2_Release.html not found. file ICreateTypeInfo_AddVarDesc.html in ICreateTypeInfo2_AddVarDesc.html not found. file IUnknown_Release.html in ICreateTypeLib2_Release.html not found. file ITypeInfo_ReleaseFuncDesc.html in ITypeInfo2_ReleaseFuncDesc.html not found. file ldap_start_tls_sW.html in ldap_start_tls_sA.html not found. file VerQueryValueW.html in VerQueryValueWrapW.html not found. file CreatePropertySheetA.html in CreatePropertySheetPageW.html not found. file StretchBlt16.html in WinGStretchBlt16.html not found. file ICreateTypeLib_CreateTypeInfo.html in ICreateTypeLib2_CreateTypeInfo.html not found. file ITypeInfo_GetNames.html in ITypeInfo2_GetNames.html not found. file ITypeLib_GetTypeComp.html in ITypeLib2_GetTypeComp.html not found. file ICreateTypeInfo_SetTypeDescAlias.html in ICreateTypeInfo2_SetTypeDescAlias.html not found. file IUnknown_QueryInterface.html in ICreateTypeInfo2_QueryInterface.html not found. file ITypeInfo_CreateInstance.html in ITypeInfo2_CreateInstance.html not found. file ITypeInfo_Invoke.html in ITypeInfo2_Invoke.html not found. file ITypeLib_GetTypeInfoCount.html in ITypeLib2_GetTypeInfoCount.html not found. file ITypeLib_FindName.html in ITypeLib2_FindName.html not found. file ICreateTypeInfo_SetHelpContext.html in ICreateTypeInfo2_SetHelpContext.html not found. file ITypeInfo_AddressOfMember.html in ITypeInfo2_AddressOfMember.html not found. file ICreateTypeInfo_AddFuncDesc.html in ICreateTypeInfo2_AddFuncDesc.html not found. file ITypeLib_ReleaseTLibAttr.html in ITypeLib2_ReleaseTLibAttr.html not found. file ICreateTypeInfo_SetTypeIdldesc.html in ICreateTypeInfo2_SetTypeIdldesc.html not found. file ICreateTypeLib_SetDocString.html in ICreateTypeLib2_SetDocString.html not found. file IUnknown_AddRef.html in ITypeLib2_AddRef.html not found. file SHGetNewLinkInfoW.html in SHGetNewLinkInfoWrapW.html not found. file ICreateTypeInfo_SetVarHelpContext.html in ICreateTypeInfo2_SetVarHelpContext.html not found. file ITypeLib_GetDocumentation.html in ITypeLib2_GetDocumentation.html not found. file ITypeInfo_GetFuncDesc.html in ITypeInfo2_GetFuncDesc.html not found.

1 0

Re: user32: add tests for handling exposed regions created by other threads
by Clinton Stimpson 14 Dec '07

14 Dec '07

Anything wrong with this patch? I'm guessing its the Sleep(). Any other way to force X server to put expose events in the queue, if any? This is for bug #9875. Clinton Stimpson

1 0

Re: Undocumented behaviour in ReqQueryValueEx when 'count' and 'type'point to the same address
by Dmitry Timoshkov 14 Dec '07

14 Dec '07

"Sam Dennis" <samuel.howard.dennis(a)gmail.com> wrote: > + size = 4; > + ret = RegQueryValueExA(hkey_main, "BIN32", NULL, &size, buffer, &size); > + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); What this test is supposed to test? -- Dmitry.

2 3

dinput - mouse warping -games that needs it?
by Adam Rimon 14 Dec '07

14 Dec '07

Hi, I'm trying to get rid of the warping patch, or at least to change it to something that won't make the mouse stuck in the middle of the screen in some games (Next Life for instance). Can you give me names of games that need this warping? (I had found in the archives a mention of Quake II, but when I downloaded it's demo and tried to play it with a dinput.dll that doesn't have this warping, everything worked just fine.) Thanks, -Adam

4 3

Re: [PATCH] use a better size to lstrcpynW
by Alexandre Julliard 14 Dec '07

14 Dec '07

Marcus Meissner <meissner(a)suse.de> writes: > - lstrcpynW( num, begin + 1, end - begin ); > - begin += end - begin + 1; > + > + xcnt = end - begin; > + if (xcnt > sizeof(num)/sizeof(WCHAR)) > + xcnt = sizeof(num)/sizeof(WCHAR); > + lstrcpynW( num, begin + 1, xcnt ); > + begin += xcnt + 1; Truncating the string is not a correct fix. Overflow should either be treated as an error, or a buffer should be allocated dynamically. -- Alexandre Julliard julliard(a)winehq.org

1 0

Create a 'take bug' option in bugzilla?
by Maarten Lankhorst 14 Dec '07

14 Dec '07

Hi all, I'm getting tired of having to do 3 changes to take a bug. First I have to set the status to 'assigned', this makes the bug assigned to wine-bugs. Now that it is assigned, I can set the assignee to my own email address, that automatically changes the status to 'new', and I have to set the status to 'assigned' again. Is it at least possible that an option 'assign to me' shows up and works for people with sufficient bugzilla access? -Maarten

1 0

Re: [PATCH 3/4] quartz: make test_aggregation non-static
by Alexandre Julliard 14 Dec '07

14 Dec '07

"Lei Zhang" <thestig(a)google.com> writes: > Hi, > > This lets us call test_aggregation() from other files. In general it's better to avoid sharing functions across tests, it makes it hard to grab a single test and quickly build it on Windows. In this case you could test all the interfaces in the same file. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winex11.drv: style changes can change a managed window to unmanaged
by Alexandre Julliard 14 Dec '07

14 Dec '07

Ken Thomases <ken(a)codeweavers.com> writes: > This fixes an issue with Internet Explorer's tooltips. On the Mac, at least, > they steal focus from the main window, disrupting user interaction. This won't work with many window managers; the only way would be to destroy the window and create a brand new one, but that's fairly tricky to get right. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: GDI32: GetSystemPaletteEntries should fill with default palette in non-palette video mode (with tests)
by Alex Villacís Lasso 13 Dec '07

13 Dec '07

Alex Villacís Lasso escribió: > Patches originally by Alexander Dorofeyev <alexd14(a)hushmail.com>. > > This patch tries to fix bug #201 (igowin shows black squares instead > of proper transparency). It was sent back in October, but there was no > feedback back then. So I am resending a rediff against current git. > > Changelog: > * GetSystemPaletteEntries() should fill entries with default 20-color > system palette when called in a non-palette video mode. > * Tests for above behavior. > > ------------------------------------------------------------------------ > > Any feedback on this patch? -- perl -e '$x=2.4;print sprintf("%.0f + %.0f = %.0f\n",$x,$x,$x+$x);'

1 0

Re: Alexandre Julliard : hhctrl.ocx: Store a copy of the string pointers to enable freeing them without casting away const .
by Robert Shearman 13 Dec '07

13 Dec '07

Alexandre Julliard wrote: > hhctrl.ocx: Store a copy of the string pointers to enable freeing them without casting away const. I've noticed that there is a trend of doing more and more of this type of fix. Is it really worth the performance penalty of doing this instead of adding in an appropriate macro or just not turning on the warning? -- Rob Shearman

2 1

Re: urlmon #1: Fixed handling MIME type in Binding object.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Jacek Caban <jacek(a)codeweavers.com> writes: > --- > dlls/urlmon/binding.c | 97 > +++++++++++++++++++++++++++++++++++--------- This breaks the tests for me: ../../../tools/runtest -q -P wine -M mshtml.dll -T ../../.. -p mshtml_test.exe.so htmldoc.c && touch htmldoc.ok htmldoc.c:3069: Test failed: unexpected fontname "(null)" htmldoc.c:3069: Test failed: unexpected fontname "Arial" htmldoc.c:3069: Test failed: unexpected fontname "(null)" htmldoc.c:3948: Test failed: (60) cmdf=00000003, expected 00000007 htmldoc.c:3956: Test failed: (57) cmdf=00000003, expected 00000007 make: *** [htmldoc.ok] Error 5 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: shlwapi:ordinal:Add comment to a function. [resend]
by Alexandre Julliard 13 Dec '07

13 Dec '07

Anatoly Lyutin <vostok(a)etersoft.ru> writes: > Changelog: > Add comment to a function SHCreateShellPalette(). There's no point in resending doc patches that have clearly been written by looking at the MSDN docs, they won't be applied. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ntoskrnl.exe: DPRINTF -> TRACE.
by Robert Shearman 13 Dec '07

13 Dec '07

Andrew Riedi wrote: > - if (TRACE_ON(relay)) > - DPRINTF( "%04x:Call driver dispatch %p (device=%p,irp=%p)\n", > - GetCurrentThreadId(), dispatch, device, &irp ); > + TRACE_(relay)( "%04x:Call driver dispatch %p (device=%p,irp=%p)\n", > + GetCurrentThreadId(), dispatch, device, &irp ); Please don't change relay traces to use TRACE. This channel has specific requirements and so doesn't benefit from using TRACE instead of DPRINTF. -- Rob Shearman

1 0

Re: user32: DPRINTF -> TRACE.
by Alexandre Julliard 13 Dec '07

13 Dec '07

"Andrew Riedi" <andrewriedi(a)gmail.com> writes: > LRESULT ret; > > - if (TRACE_ON(relay)) > - DPRINTF( "%04x:Call hook proc %p (id=%s,code=%x,wp=%08lx,lp=%08lx)\n", > - GetCurrentThreadId(), proc, hook_names[id-WH_MINHOOK], code, wparam, lparam ); > + TRACE_(relay)( "%04x:Call hook proc %p (id=%s,code=%x,wp=%08lx,lp=%08lx)\n", > + GetCurrentThreadId(), proc, hook_names[id-WH_MINHOOK], code, > + wparam, lparam ); Relay traces are different, they must not use TRACE. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: includes: Update oleacc with new constants and iaccessible interface
by Alexandre Julliard 13 Dec '07

13 Dec '07

Maarten Lankhorst <maarten(a)codeweavers.com> writes: > +cpp_quote("#define ROLE_SYSTEM_ALERT 8") > +cpp_quote("#define ROLE_SYSTEM_ANIMATION 54") > +cpp_quote("#define ROLE_SYSTEM_APPLICATION 14") > +cpp_quote("#define ROLE_SYSTEM_BORDER 19") > +cpp_quote("#define ROLE_SYSTEM_BUTTONDROPDOWN 56") > +cpp_quote("#define ROLE_SYSTEM_BUTTONDROPDOWNGRID 58") > +cpp_quote("#define ROLE_SYSTEM_BUTTONMENU 57") > +cpp_quote("#define ROLE_SYSTEM_CARET 7") Entries should be sorted by value, not by name. > +typedef enum tagSELFLAG > +{ > + SELFLAG_NONE = 0, > + SELFLAG_TAKEFOCUS = 1, > + SELFLAG_TAKESELECTION = 2, > + SELFLAG_EXTENDSELECTION = 4, > + SELFLAG_ADDSELECTION = 8, > + SELFLAG_REMOVESELECTION = 16 > +} SELFLAG; These should be defines, not enums. > + HRESULT get_accParent([out, retval]IDispatch** ppdispParent); > + HRESULT get_accChildCount([out, retval] long* pcountChildren); > + HRESULT get_accChild([in] VARIANT varChildID, [out, retval]IDispatch **ppdispChild); These (and the others) should be propget functions. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [3/4] WineX11: Ignore the alpha if all pixels are 0x00
by Juan Lang 13 Dec '07

13 Dec '07

Hi Stefan, a few minor nits: + * one pixel has alpha != 0x00, and the mask ignored as described in the Do you mean, "the mask is ignored...", or "the AND mask is ignored..." ? + * written at 8 / 16 bpp times do not knwow about the 32 bit alpha, so s/knwow/know/ + for (y = 0; y < ymax; ++y) + { + xor_ptr = xor_bits + (y * xor_width_bytes); + for (x = 0; x < xmax; ++x) + { + if(xor_ptr[3] != 0x00) { + alpha_zero = FALSE; + break; For the first for loop, you probably want something like (for y = 0; alpha_zero && y < ymax... Also, the whitespace around the if is a bit funny. --Juan

2 1

Re: shdocvw #3: Set default home and search page.
by Aric Stewart 13 Dec '07

13 Dec '07

I see that the native shdocvw sets neither the Start page nor the Search page when registered. This patch forces the users home page to initially be www.winehq.com which can be confusing to IE users who are expecting the normal default of msn.com While amusing I do not think this is correct. -aric Jacek Caban wrote: > --- > dlls/hlink/tests/hlink.c | 4 ---- > dlls/shdocvw/shdocvw.inf | 12 +++++++++--- > 2 files changed, 9 insertions(+), 7 deletions(-) > > > ------------------------------------------------------------------------ > >

3 8

Re: Patch for process title on FreeBSD
by Stefan Dösinger 12 Dec '07

12 Dec '07

Am Mittwoch, 12. Dezember 2007 18:50:39 schrieb Kris Moore: > Hey all! > > One of our devs noticed that on FreeBSD we don't get the process name > set properly, so in "ps" we get a lot of wine-pthread garbage. Here's a > small patch to fix this in dlls/kernel32/process.c > > I tried to make this as small & simple as possible, please let me know > what you think! I think using argv[1] is not the best way, as some wine parameter might be added in the future, or someone might use something like binfmt_misc on Linux to launch the app. In that case the .exe name is propably argv[0], but I am not sure.

2 1

Re: [5/5] gdi: Test bitmap depths
by Dmitry Timoshkov 12 Dec '07

12 Dec '07

Stefan Doesinger <stefan(a)codeweavers.com> wrote: > This obsolettes the 15 bpp bitmap and 16 bpp screen compatibility since > 15 bpp bitmaps do not exist. 15 bpp bitmaps do exist. According to the Feng Yuan's book that depends on the driver and hardware. -- Dmitry.

3 4

Re: Undocumented behaviour in ReqQueryValueEx when 'count' and 'type' point to the same address
by Juan Lang 12 Dec '07

12 Dec '07

Hi Sam, - DWORD total_size; + DWORD total_size, datalen; (snip) + if (count) datalen = *count; (snip) - if (len > *count) status = STATUS_BUFFER_OVERFLOW; + if (len > datalen) status = STATUS_BUFFER_OVERFLOW; I mentioned when I reviewed the patch that datalen might be uninitialized. You're right that it isn't, since it's set when count is not NULL, and read when data is not NULL. The function fails earlier if data is not NULL and count is NULL, so again, you're right: it isn't uninitialized when it's read. Nevertheless, it took a pretty in-depth read to check that, and the patch introduces an unneeded warning. You can avoid it simply, so please do. --Juan

1 0

Valgrind results Dec 11: new quartz/filtergraph crash (oh, Lei...)
by Dan Kegel 12 Dec '07

12 Dec '07

New results at http://kegel.com/wine/valgrind/logs-2007-12-11-summary.txt The changes from yesterday are probably noise except: The tests crashed and valgrind hung while running the quartz/filtergraph test; see http://kegel.com/wine/valgrind/logs-2007-12-11/vg-quartz_filtergraph-diff.t… +Unhandled exception: page fault on read access to 0xffffffff in 32-bit code (0x045e1290). +Backtrace: +=>1 0x045e1290 func_filtergraph+0x110() [/home/dank/wine-git/dlls/quartz/tests/filtergraph.c:161] in quartz_test (0x7f22fe58) + 2 0x045e20e8 run_test+0x128(name=0x7f0003f7) [/home/dank/wine-git/dlls/quartz/tests/../../../include/wine/test.h:389] in quartz_test (0x7f22fea8) + 3 0x045e277d main+0x14d(argc=<register ECX not in topmost frame>, argv=<register ECX not in topmost frame>) [/home/dank/wine-git/dlls/quartz/tests/../../../include/wine/test.h:437] in quartz_test (0x7f22fed8) + 4 0x045e284b __wine_spec_exe_entry+0x5b(peb=0x7ffdf000) [/home/dank/wine-git/dlls/winecrt0/exe_entry.c:36] in quartz_test (0x7f22ff08) + 5 0x045198be start_process+0xee(arg=0x0) [/home/dank/wine-git/dlls/kernel32/process.c:839] in kernel32 (0x7f22ffe8) + 6 0x0402c9e7 wine_switch_to_stack+0x17() in libwine.so.1 (0x00000000) +0x045e1290 func_filtergraph+0x110 [/home/dank/wine-git/dlls/quartz/tests/filtergraph.c:161] in quartz_test: movl 0x0(%eax),%edx +161 hr = IFilterGraph2_Release(pF); Lei, could you have a look? You were just in here... - Dan

4 3

Re: #2 usp10: Do glyph translation for truetype fonts only.
by Alexandre Julliard 12 Dec '07

12 Dec '07

Hans Leidekker <hans(a)it.vu.nl> writes: > Changelog > Do glyph translation for truetype fonts only. This fails here: ../../../tools/runtest -q -P wine -M usp10.dll -T ../../.. -p usp10_test.exe.so usp10.c && touch usp10.ok usp10.c:217: Test failed: Translation to place when told not to. WCHAR 0 - 0054 != 0037 make[2]: *** [usp10.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

hlsl2glsl
by luis.busquets＠ilidium.com 12 Dec '07

12 Dec '07

hlsl2glsl is the good solution for implementing shaders on directX 10. Nevertheless, the hlsl compilation to tokens has to be done for d3d9. On the other hand, if we implement d3dx9_xx, it is likely that the application will be using the compile D3DX9CompileShader to get the tokens. Currently it works and we can use the libraries d3dx9_xx and get good results but the following tranfosmations: 1. HLSL is compiled to tokens 2. Tokens are transformed to GLSL. I think that a good addition if the d3dx9_xx libraries are going to be implemented is to put a resource in wined3d that would let know which source HLSL code the tokens are meant to be and add the capability to instead of transform tokens to GLSL, to let wine know which is the HLSL source code the tokens came from. Then, there is the possibility to let wine do if it is available a HLSL2GLSL transfomation directly from the HLSL to GLSL. 1. HLSL is compiled to tokens and the result structure has a pointer to the HLSL source code. 2. If activated the "use HLSL2GLSL for directX9 Shaders when available" and the HLSL source code is available then 2.1. use HLSL2GLSL to transform the HLSL source code 2.2. Compile GLSL. 3. If not 2. then Tokens are transformed to GLSL. The aim would not be to gain compilation time but to be more loyal to the source HLSL. The final executable instead of making exactly what the ASM is meant to do, it would make exactly what the HLSL is meant to do and probably would be more optimized for the particular system. HLSL --> Tokens --> GLSL --> Executable that performs the actions of the tokens HLSL --> GLSL --> Executable that performs the actions of the HLSL. Furthermo, taking into consideration the need of HLSL2GLSL for DirectX 10, the hlsl2glsl will have to be set anyway. Therefore, the code needs are not so big but just leaving the door open. What do you all think and in particular David?

4 6

wine proccess list
by Gonzalo Martinez - Sanjuan Sanchez 12 Dec '07

12 Dec '07

Hello to all. I have something in mind that I would like to ask to Wine developers. Is it possible using a hack/trick or a hidden option to change the name of wine in the proccess lists? I mean, Is it possible to list 'wine' proccess as, for example 'iexplorer' when I use Internet Explorer under Wine? Thanks a lot for your work, hope my question find the answer here.

9 10

Re: imagehlp: improve last error handling in ImageGetCertificateData
by Juan Lang 12 Dec '07

12 Dec '07

Hi Aric, - if( !Certificate ) + if( *RequiredLength < size ) { *RequiredLength = size; - return TRUE; + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; } - if( *RequiredLength < size ) + if( !Certificate ) { *RequiredLength = size; - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; + return TRUE; } Are you sure this is the order that *RequiredLength and Certificate are checked in? Seems backwards to the normal style to me. I won't bug you for a proper regression test, as I failed to produce one too :) --Juan

2 3

wine proccess list
by Kris Moore 11 Dec '07

11 Dec '07

Gonzalo sent me this thread, and I may be able to get a patch put together here soon. First, I wanted to make sure I'm on the right path: Can somebody confirm for me that this is the right location where I should be trying to fix this? http://source.winehq.org/source/loader/preloader.c#L1006 FreeBSD has a function called setproctitle(), which I'm pretty sure is the right one for this task. http://www.freebsd.org/cgi/man.cgi?query=setproctitle&apropos=0&sektion=0&m… I'll probably try and see about a patch here in the next day or so. Who do I send it to if I can get it working? -- Kris Moore PC-BSD Software http://www.pcbsd.com Am Dienstag, 11. Dezember 2007 20:25:20 schrieb Gonzalo Martinez - Sanjuan Sanchez: > El Tuesday 11 December 2007 7:34:49 pm escribió: > > Am Dienstag, 11. Dezember 2007 18:02:53 schrieb Gonzalo Martinez - > > Sanjuan > > > > Sanchez: > > > Hello to all. > > > > > > I have something in mind that I would like to ask to Wine developers. > > > Is it possible using a hack/trick or a hidden option to change the > > > name of wine in the proccess lists? > > > I mean, Is it possible to list 'wine' proccess as, for example > > > 'iexplorer' when I use Internet Explorer under Wine? > > > > > > Thanks a lot for your work, hope my question find the answer here. > > > > This is done since quite some time. apps are usually called > > "iexplore.exe", or they have the name of the file that was passed to > > wine, like C:\Program Files\Internet Explorer\iexplore.exe > > > > If you still see "wine", "wineloader" or something similar you have a > > very outdated version of wine. > > Well, im talking about Wine 0.9.48 under FreeBSD/PC-BSD OS. Ow, ah, this is a different business. I think we use some Linux-only feature to set the name, and Alexandre told me that at least MacOS doesn't have it. I have no idea if there is a way to change the process name under BSD. If there is, feel free to implement it and send a patch

3 2

Re: wintrust: implementations for WTHelperGetFileName and WTHelperGetFIleHandle
by Jacek Caban 11 Dec '07

11 Dec '07

Hi Aric, Aric Stewart wrote: > + else > + return (HANDLE)0xffffffff; That's what is INVALID_HANDLE_VALUE for. Jacek

1 0

Monday's valgrind results: no new errors
by Dan Kegel 11 Dec '07

11 Dec '07

http://kegel.com/wine/valgrind/logs-2007-12-10-summary.txt seems to show lots of valgrind regressions in mshtml, but http://kegel.com/wine/valgrind/logs-2007-12-10/vg-mshtml_dom-diff.txt shows the difference is that I happen to have installed Gecko. So they aren't really regressions (or if there are any, they're buried in the noise), and today's git is probably about as Valgrind-clean as Saturday's. - Dan

2 3

Re: winspool: implement EnumFormsA/W for form level 1, add a few builtinforms
by Dmitry Timoshkov 11 Dec '07

11 Dec '07

"Marcel Partap" <mpartap(a)gmx.net> wrote: > +static const struct builtin_form builtin_forms[] = { > + {{'L','e','t','t','e','r',0}, {{216000,279000}, {0,0,216000,279000}, 0, FORM_BUILTIN}}, > + {{'A','3',0}, {{297000,420000}, {0,0,297000,420000}, 0, FORM_BUILTIN}}, > + {{'A','4',0}, {{210000,297000}, {0,0,210000,297000}, 0, FORM_BUILTIN}}, > + {{'A','5',0}, {{148000,210000}, {0,0,148000,210000}, 0, FORM_BUILTIN}} }; I guess this info should be fetched from the printer, not hard coded. -- Dmitry.

2 1

Re: ntdll: Initialize APC call and result variables to suppress valgrind warnings
by Alexandre Julliard 11 Dec '07

11 Dec '07

Dmitry Timoshkov <dmitry(a)codeweavers.com> writes: > Alexandre said that it's OK to use memset for server requests because of > backwards compatibility. It's OK for requests, but why do you want to initialize the result structure too? -- Alexandre Julliard julliard(a)winehq.org

2 2

Wine Weekly News
by Kai Blin 11 Dec '07

11 Dec '07

Hi Zach, thanks for getting a new WWN issue out there. Finally there's more than one release after the other. I think WWN is a really valuable ressource for our users. Also, I hope it'll be a platform to get some GSoC exposure on the front page, especially without me having to take care of it. ;) Thanks, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

12 19

Re: kernel32: cpu: Detect AMD 64bit CPUs
by Alexandre Julliard 11 Dec '07

11 Dec '07

Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> writes: > kernel32: cpu: Detect AMD 64bit CPUs Are you really supposed to return a 64bit CPU in 32-bit mode? Do you have a test case? -- Alexandre Julliard julliard(a)winehq.org

3 2

Work legalities
by Nathan Williams 11 Dec '07

11 Dec '07

Hey everyone, I have been planning to do some work on wine for a while now, but after I started working I got myself a new programming job. I'm worried about the copyright of any external work I do, so I need a little advice. What do I need from my employer to clear me to work on wine? Is something verbal ok, or should I get it in writing? -- Nathan

10 12

Re: winex11drv: Treat CapsLock and NumLock keys as normal keys. They should toggle on button down.
by Alexandre Julliard 11 Dec '07

11 Dec '07

Vitaliy Margolen <wine-patches(a)kievinfo.com> writes: > On winxp both keys toggle on button down not button up. So no need for any extra treatment. > Fixes bug 10446. You still have to handle the case when the state has been toggled outside of Wine, you can't just get rid of the whole thing. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [2/5] WineD3D: Remove 24/32 bit hacks
by Chris Robinson 11 Dec '07

11 Dec '07

On Monday 10 December 2007 03:24:04 pm Stefan Dösinger wrote: > devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; > - devmode.dmBitsPerPel = (bpp >= 24) ? 32 : bpp; /* Stupid XVidMode cannot > change bpp */ Did you mean to leave dmBitsPerPel at 0?

2 1

Re: shlwapi: Fix memory leak in test
by Zac Brown 11 Dec '07

11 Dec '07

Alistair Leslie-Hughes wrote: > Hi, > Changelog: > shlwapi: Fix memory leak in test. > > Best Regards > Alistair Leslie-Hughes > > > No patch attached? -Zac

1 0

re: COM
by Dan Kegel 11 Dec '07

11 Dec '07

Adelle wrote: > I have some COM DLLs which work fine with VB6 applications on wine. > Is it possible to instantiate a windowsy COM object from a linuxy > application written in some form of C++ (eg, for compilation with gcc)? Erm, maybe you could write a winelib app, but you might have to use the C interface to COM. Why not keep using the VB6 app? - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

deleting AppDB deleted
by Richard S 10 Dec '07

10 Dec '07

Hi Im one of the maintainers of the iTunes 6.x (was) On Saturday I received this email ' Subject: [AppDB] Version '6.x' of 'iTunes' deleted Date: Sat, 08 Dec 2007 12:15:45 -0600 (18:15 GMT) Version '6.x' of 'iTunes' deleted ------------------------------------------------------- The action was performed by Wesley Hamel Reasons given Cleanup ' Is it standard practice to remove all old versions of a program except for the most recent? IF this is true, WHY? Rich

4 3

Bugzilla rights
by Vitaliy Margolen 10 Dec '07

10 Dec '07

Bugzilla admin, please disallow people to add/remove e-mail addresses to/from bugs unless they've been given that right. Or at least have rights to modify any aspect of the bug. Thanks, Vitaliy.

6 6

File a bug report?
by Gilles May 10 Dec '07

10 Dec '07

Hi everybody. After updating WINE to from 0.9.49 to 0.9.50 I noticed major slowdown in Company of Heroes, to the point that I get like 1 Frame every 2 seconds. Wine spams the console with: fixme:d3d_shader:IWineD3DVertexShaderImpl_CompileShader Vertexshader 0x4d20b78 recompiled more than 50 times Trying to find out the cause for the slowdown I did my first attempt at using git bisect and I could trace the slowdown to this patch: 959212304dfaf0e7459374593b20b74fe22a0b57 is first bad commit commit 959212304dfaf0e7459374593b20b74fe22a0b57 Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 20 21:14:10 2007 +0100 wined3d: Track vertex declaration changes on vertex shaders. If an attribute has type D3DDECLTYPE_D3DCOLOR, the red and blue channels are swizzled in the shader. Since the attribute is stored in the vertex declaration and not the vertex shader, it can change by setting a new vertex declaration. If this happens, we have to recompile the shader with the swizzling of that specific attribute turned on or off. :040000 040000 327661a4d0f8a02bdc18380084589c891b64af9c e35a2bcbf9514e4f261d8b7a93dcb24c0b3c89a7 M dlls Now without that patch there is slight texture corruption in the game, with the patch it's much much less but it renders the game unplayable. The reason I didn't file a bug report is that I am not sure if it is really a bug or not since obviously the patch fixes in-game texture corruption. Regards, Gilles

2 1

Read Application Memory
by Kai Lauterbach 10 Dec '07

10 Dec '07

Hi, at the moment I'm writing a little Linux based program to read some variables from a Windows application. But my problem is, that i can't access to the virtual memory of the Win App running under wine. I don't know how to do this. c/c++ isn't the problem but the right way to do it. I've already read the wineserver's main.c and fd.c but I think that it's not a good way to put a code into, which give's me the chance to read something. I need sth to connect, like /dev/mem or a network port. My second idea was the wine debugger. Is it possible to get access the application memory at runtime from this? I mean, without stopping the application? I hope you can help me and I've described my problem as clear as possible ;) Greetings, Kai -- Kai Lauterbach <klaute(a)gmx.de>

3 2

Re: [PATCH 1/3] qmgr: Added DllGetClassObject and DllCanUnloadNow.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Roy Shea <roy(a)cs.hmc.edu> writes: > Revision 2. Made dll_ref static for now. > --- > dlls/qmgr/qmgr.spec | 2 ++ > dlls/qmgr/qmgr_main.c | 16 ++++++++++++++++ > 2 files changed, 18 insertions(+), 0 deletions(-) > > diff --git a/dlls/qmgr/qmgr.spec b/dlls/qmgr/qmgr.spec > index 1a63b32..c534b4f 100644 > --- a/dlls/qmgr/qmgr.spec > +++ b/dlls/qmgr/qmgr.spec > @@ -1,2 +1,4 @@ > +@ stdcall -private DllCanUnloadNow() > +@ stdcall -private DllGetClassObject(ptr ptr ptr) > @ stub DllRegisterServer > @ stub DllUnregisterServer These don't exist in the Windows dll. I don't think they make much sense in a service dll. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: user32: Test the initial state of the cursor.
by Alexandre Julliard 10 Dec '07

10 Dec '07

"Andrew Riedi" <andrewriedi(a)gmail.com> writes: > +static void test_initial_cursor(void) > +{ > + HCURSOR cursor, cursor2; > + DWORD error; > + > + cursor = GetCursor(); > + > + /* Check what handle GetCursor() returns if a cursor is not set yet. */ > + SetLastError(0xdeadbeef); > + cursor2 = LoadCursor(NULL, IDC_WAIT); > + todo_wine { > + ok(cursor == (HCURSOR) 0x00010015, "Cursor handle is %p, not 0x00010015.\n", cursor); It doesn't make sense to hardcode handle values, it's not a behavior we want to replicate. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: sfnt2fnt: Use code from gdi32/freetype to do a better job findingthe TTAG_EBLC to deal with older version of freetype without having tofall back on unreliable hacks
by Dmitry Timoshkov 10 Dec '07

10 Dec '07

"Aric Stewart" <aric(a)codeweavers.com> wrote: > + /* If the FT_Load_Sfnt_Table function is there we'll use it */ > +#ifdef HAVE_FT_LOAD_SFNT_TABLE > + err = FT_Load_Sfnt_Table(ft_face, table, offset, buf, len); > +#endif > +#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H Probably using #elif instead of #endif+#ifdef above would be more correct. -- Dmitry.

1 0

directX 10 and hlsl2glsl
by Sònia Xapellí Brú 10 Dec '07

10 Dec '07

I know there was some discussion concerning the use of hlsl2glsl and that it is not directly useful as it seems that the conversion to assembler is necessary in d3d9. Nevertheless, when it comes to d3d10,Shader Model 4 relies only in source code and forbids the programmers from implementing directly the assembler tokens. Therefore, I think that in this case the best solution, maximising the use of the graphic card capabilities goes mandatory to the use of the trasnlator and leaving up to the graphic card driver the compilation of GLSL. What do you think?

2 1

Re: wined3d: improve thread safety in IWineD3DSurfaceImpl_BltOverride
by Roderick Colenbrander 10 Dec '07

10 Dec '07

Hi, The patch itself could be correct in the sense that indeed there might be a missing ActivateContext. But we should avoid making recursive ENTER_GL's. Between the ENTER_GL block there is a call to IWineD3DDevice_Clear which also calls ENTER_GL. You could put a LEAVE_GL before it and an ENTER_GL after it but there is something else which you couldn't have known. A number of places in surface.c are messing with glDrawBuffer. These days activatecontext is also handling this, so in a number of places glDrawBuffer is redundant. This might be one of those places but I haven't checked that in detail. Stefan might be able to answer that. Regards, Roderick -- GMX FreeMail: 1 GB Postfach, 5 E-Mail-Adressen, 10 Free SMS. Alle Infos und kostenlose Anmeldung: http://www.gmx.net/de/go/freemail

1 0

Read RAM from Process
by Kai Lauterbach 10 Dec '07

10 Dec '07

Hi, at the moment I'm writing a little Linux based program to read some variables from a Windows application. But my problem is, that i can't access to the virtual memory of the Win App running under wine. I don't know how to do this. c/c++ isn't the problem but the right way to do it. I've already read the wineserver's main.c and fd.c but I think that it's not a good way to put a code into, which give's me the chance to read something. I need sth to connect, like /dev/mem or a network port. My second idea was the wine debugger. Is it possible to get access the application memory at runtime from this? I mean, without stopping the application? I hope you can help me and I've described my problem as clear as possible ;) Greetings, Kai -- Kai Lauterbach <lauterbach.kai(a)web.de>

2 1

Re: wined3d: improve thread safety in IWineD3DSurfaceImpl_BltOverride
by Stefan Dösinger 10 Dec '07

10 Dec '07

Am Montag, 10. Dezember 2007 12:39:51 schrieb Alexander Dorofeyev: > Fixes crash in Aliens vs Predator 2 loading screen (bug # 4513 > http://bugs.winehq.org/show_bug.cgi?id=4513). > > --- > dlls/wined3d/surface.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) Looks good to me

1 0

[press] Phoronix compares 7 versions of Wine
by Jonathan Ernst 10 Dec '07

10 Dec '07

Hello, What do you think about their tests and results ? http://www.phoronix.com/vr.php?view=11539 "The performance in the fourteen 3DMark 2001 SE and 3DMark 2003 tests were fairly consistent in the releases between WINE 0.9.44 and WINE 0.9.50 -- generally only swaying a few frames in either direction -- though the performance overall has slightly declined and we were surprised by a few of the results."

4 4

ALLUSERSPROFILE Patch
by Austin English 10 Dec '07

10 Dec '07

While looking at bug 7292 (http://bugs.winehq.org/show_bug.cgi?id=7292) I wrote a patch to implement ALLUSERSPROFILE. I looked on MSDN/Google for the dirid for this shell folder, but can only find dirids for it's subdirectories. For example: 16406 All Users\Start Menu 16407 All Users\Start Menu\Programs 16408 All Users\Start Menu\Programs\Startup 16409 All Users\Desktop 16415 All Users\Favorites 16419 All Users\Application Data Looking for an opinion on which would be better, to map ALLUSERSPROFILE to %10%\profiles\All Users (This is how my current patch does it) Or I could continue looking for the windows implementation of it, which so far hasn't proven very fruitful. Patch is attached.

2 1

msi: fix missing alloc check [try 2]
by Lionel_Debroux 09 Dec '07

09 Dec '07

Removed a level of indentation, following feedback of James Hawkins. 2007-12-09 Lionel Debroux <lionel_debroux(a)yahoo.fr> * dlls/msi/dialog.c: msi: fix missing alloc check.

1 0

msi: fix memory leaks (found by Smatch) [try 2]
by Lionel_Debroux 09 Dec '07

09 Dec '07

Fixed stupid mistake pointed by James Hawkins. 2007-12-09 Lionel Debroux <lionel_debroux(a)yahoo.fr> * dlls/msi/database.c: msi: fix memory leaks (found by Smatch).

1 0

msi: fix missing alloc check.
by Lionel_Debroux 09 Dec '07

09 Dec '07

"msi_dialog_list_box" in dlls/msi/dialog.c gets flagged by Michael Stefaniuc's unfree-wine.pl script. * As far as I can see, "info", allocated line 2203, is not used before the return that leaks it (line 2214), neither in a direct nor an indirect (macro) way. But maybe the "fail-fast" behaviour is intended (because if allocation of "info" fails, there are chances the allocation of "control" would fail, too) ? * While looking at the source of the functions called by "msi_dialog_list_box" to make sure they didn't use "info", I spotted a call to msi_alloc, whose result is not checked. Therefore, the subsequent lines may write to NULL+some_offset. The patch contains only the fix for the latter problem, because I'm not 100% sure that the memory leak can be solved by moving the allocation of info after the call to "msi_dialog_add_control", without ill side effects (e.g. msi_dialog_add_control calls msi_dialog_create_window, which calls CreateWindowExW). 2007-12-09 Lionel Debroux <lionel_debroux(a)yahoo.fr> * dlls/msi/dialog.c: msi: fix missing alloc check.

2 1

Re: msi: fix memory leaks (found by Smatch).
by James Hawkins 09 Dec '07

09 Dec '07

On Dec 9, 2007 4:44 AM, Lionel_Debroux <lionel_debroux(a)yahoo.fr> wrote: > "msi_build_insertsql_data" and "MSI_DatabaseImport" in > dlls/msi/database.c get flagged by Michael Stefaniuc's unfree-wine.pl > script. > > It looks there are more leaks than unfree-wine.pl reports, due to > constructs of the form > ptr = msi_realloc(ptr, size); > Fixed those as well. > > 2007-12-09 Lionel Debroux <lionel_debroux(a)yahoo.fr> > * dlls/msi/database.c: > msi: fix memory leaks (found by Smatch). > - columns = msi_realloc(columns, sql_size * sizeof(WCHAR)); - if (!columns) + temp_columns = msi_realloc(columns, sql_size * sizeof(WCHAR)); + if (!temp_columns) + { + HeapFree( GetProcessHeap(), 0, columns); return NULL; + } lstrcatW(columns, expanded); This is wrong. There's no guarantee that realloc returns the same position in memory. -- James Hawkins

1 0

Re: [PATCH 3/6] COMDLG32: printdlg: check hook pointer (resend 3)
by Dmitry Timoshkov 09 Dec '07

09 Dec '07

"Vitaly Lipatov" <lav(a)etersoft.ru> wrote: > --- dlls/commdlg/printdlg.c 11 Jan 2006 11:37:03 -0000 1.100 > +++ dlls/comdlg32/printdlg.c 24 Feb 2006 17:47:53 -0000 The way you've generated this patch looks pretty strange. > /* Call user paint hook if enable */ > if (pda->dlga->Flags & PSD_ENABLEPAGEPAINTHOOK) > - if (pda->dlga->lpfnPagePaintHook(hwndDlg, uMsg, wParam, lParam)) > + if (pda->dlga->lpfnPagePaintHook && pda->dlga->lpfnPagePaintHook(hwndDlg, uMsg, wParam, lParam)) You have to add the checks existing in PageSetupDlgA to PageSetupDlgW instead. Also, in order to increase the probability of your patches to be included should either point to existing bug that each of your patches fix, or/and add a test case which doesn't pass without your patch and does with it. -- Dmitry.

2 2

speeding up regression testing by disabling building of tests?
by Dan Kegel 09 Dec '07

09 Dec '07

Lots of the time in regression searches is spent compiling tests, but when you're only going to run the app that's breaking, that's not too useful. How does one disable compilation of conformance tests? I have this funny feeling Lei or Mikolaj did this recently, but I couldn't track it down.

2 2

Read Application Memory
by Kai Lauterbach 09 Dec '07

09 Dec '07

Hi, at the moment I'm writing a little Linux based program to read some variables from a Windows application. But my problem is, that i can't access to the virtual memory of the Win App running under wine. I don't know how to do this. c/c++ isn't the problem but the right way to do it. I've already read the wineserver's main.c and fd.c but I think that it's not a good way to put a code into, which give's me the chance to read something. I need sth to connect, like /dev/mem or a network port. My second idea was the wine debugger. Is it possible to get access the application memory at runtime from this? I mean, without stopping the application? I hope you can help me and I've described my problem as clear as possible ;) Greetings, Kai -- Kai Lauterbach <klaute(a)web.de>

1 0

Re: Alexander Nicolaysen Sørnes : comdlg32: PageSetupDlgA: Read margins from correct edit boxes.
by Vitaly Lipatov 09 Dec '07

09 Dec '07

Hello, I already posted the same patch to wine-patches one month ago: http://www.winehq.org/pipermail/wine-patches/2007-November/046156.html Why my patch was ignored? I am in some black list? В сообщении от 8 декабря 2007 Alexandre Julliard написал(a): > Module: wine > Branch: master > Commit: 51086b5513a436f51460d006f4fa7156e9d58a92 > URL: > http://source.winehq.org/git/wine.git/?a=commit;h=51086b5513a436f51460d006f >4fa7156e9d58a92 > > Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> > Date: Sat Dec 8 13:53:32 2007 +0100 > > comdlg32: PageSetupDlgA: Read margins from correct edit boxes. > > --- > > dlls/comdlg32/printdlg.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c > index e04e145..5baa90e 100644 > --- a/dlls/comdlg32/printdlg.c > +++ b/dlls/comdlg32/printdlg.c > @@ -2890,10 +2890,10 @@ PRINTDLG_PS_WMCommandA( > GETVAL(id, pda->curdlg.rtMargin.left); > break; > case edt5: > - GETVAL(id, pda->curdlg.rtMargin.right); > + GETVAL(id, pda->curdlg.rtMargin.top); > break; > case edt6: > - GETVAL(id, pda->curdlg.rtMargin.top); > + GETVAL(id, pda->curdlg.rtMargin.right); > break; > case edt7: > GETVAL(id, pda->curdlg.rtMargin.bottom); -- Vitaly Lipatov, ALT Linux Team Russia, Saint-Petersburg, www.etersoft.ru

2 2

Saturday's(!) valgrind results
by Dan Kegel 09 Dec '07

09 Dec '07

For the first time I can recall, Alexandre committed lots of changes on a Saturday, so I did a valgrind run. http://kegel.com/wine/valgrind/logs-2007-12-08-summary.txt shows the highlights; basically, lots more warnings like + Syscall param writev(vector[1]) points to uninitialised byte(s) For example, the one at the top of http://kegel.com/wine/valgrind/logs-2007-12-08/vg-user32_edit-diff.txt + Syscall param writev(vector[1]) points to uninitialised byte(s) + at (within /lib/ld-2.5.so) + by writev (in /lib/tls/i686/cmov/libc-2.5.so) + by wine_server_call (server.c:244) The only change in the server was http://source.winehq.org/git/wine.git/?a=commitdiff;h=edd3f264d95c0c6bed9c1… so I guess the new errors reflect additional error completion events being sent, and that kind of event just happens to contain some uninitialized bytes. So this is probably in Alexandre's court, and my guess is he'll consider this a false positive. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

Re: Valgrind support for our unit tests
by Robert Shearman 08 Dec '07

08 Dec '07

Dan Kegel wrote: > +{ > + todo_suppress_exception_addr4 > + Memcheck:Addr4 > + fun:__wine_call_from_32_regs > + obj:/home/dank/wine-git/dlls/ntdll/ntdll.dll.so > + obj:/home/dank/wine-git/dlls/ntdll/ntdll.dll.so > + fun:raise_exception I'm not sure this will work for other people unless they log on as dank :-) However, I don't think maintaining the valgrind suppressions file in tree is viable since most of the warnings come from system libraries which means that it is very dependent on user's distribution. It might be best to set up an external git tree for this, which would allow for people to submit patches for any bogus warnings in the runs that you publish on your website. -- Rob Shearman

4 4

File a bug report?
by Gilles May 08 Dec '07

08 Dec '07

Hi everybody. After updating WINE to from 0.9.49 to 0.9.50 I noticed major slowdown in Company of Heroes, to the point that I get like 1 Frame every 2 seconds. Wine spams the console with: fixme:d3d_shader:IWineD3DVertexShaderImpl_CompileShader Vertexshader 0x4d20b78 recompiled more than 50 times Trying to find out the cause for the slowdown I did my first attempt at using git bisect and I could trace the slowdown to this patch: 959212304dfaf0e7459374593b20b74fe22a0b57 is first bad commit commit 959212304dfaf0e7459374593b20b74fe22a0b57 Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 20 21:14:10 2007 +0100 wined3d: Track vertex declaration changes on vertex shaders. If an attribute has type D3DDECLTYPE_D3DCOLOR, the red and blue channels are swizzled in the shader. Since the attribute is stored in the vertex declaration and not the vertex shader, it can change by setting a new vertex declaration. If this happens, we have to recompile the shader with the swizzling of that specific attribute turned on or off. :040000 040000 327661a4d0f8a02bdc18380084589c891b64af9c e35a2bcbf9514e4f261d8b7a93dcb24c0b3c89a7 M dlls Now without that patch there is slight texture corruption in the game, with the patch it's much much less but it renders the game unplayable. The reason I didn't file a bug report is that I am not sure if it is really a bug or not since obviously the patch fixes in-game texture corruption. Regards, Gilles

3 2

Re: ddraw: fix wrong initialization order in IDirect3DDevice vtable
by Stefan Dösinger 08 Dec '07

08 Dec '07

Am Sonntag, 9. Dezember 2007 03:00:28 schrieb Alexander Dorofeyev: > Helps bug#7584 (http://bugs.winehq.org/show_bug.cgi?id=7584) > --- > dlls/ddraw/device.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Looks correct to me, good catch!

1 0

Re: dlls/comctl32/listview.c warning elimination
by Alexandre Julliard 08 Dec '07

08 Dec '07

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > Not a patch I am particularily proud of, but the best way I found to get > rid of > > listview.c:5043: warning: 'strW' might be used uninitialized in this function > > issued by GCC, and apart from the added cast it actually is simpler than > the original. It was done the way it is precisely to avoid the non-const cast, which triggers a warning too. -- Alexandre Julliard julliard(a)winehq.org

2 2

GetMessage related Jagged Alliance 2 regression
by Alexander Dorofeyev 08 Dec '07

08 Dec '07

Hello. I get freezes in Jagged Alliance 2 (seems to be tied to moving the mouse). It used to work in older versions. The game doesn't lock up totally (the music and sounds continue to play normally, for example), but the screen doesn't redraw and it doesn't respond to input. Activating some other window than the game window (if it's not full screen) usually unfreezes it. Bisect pointed to this change: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2896540a34a18b8aff848… server: Set the queue mask directly in get_message to avoid an extra server call. I did a bit of debugging and it looks like the game is getting stuck within a GetMessageW call. It stays in that while loop in GetMessage, mostly in MsgWaitForMultipleObjectsEx. If the mouse is moved, then it awakes, gets to PeekMessageW, from there it goes to peek_message which returns false and so PeekMessageW returns false and the game goes back to waiting within GetMessageW. peek_message returns false, because in a first call to server it gets a MSG_HARDWARE (mouse) message which it drops for some reason, then it clears PM_QS_ flags and so in a next call to server it can't get a WM_TIMER message despite an expired timer seems to be ready in the queue. I'm not sure what would be a proper fix, although I did find out that commenting out this line in peek_message() if (HIWORD(flags)) flags = PM_QS_SENDMESSAGE | LOWORD(flags); makes the game playable. Maybe this clearing of PM_QS_* flags shouldn't be done in case when the message gets dropped? Before that commit nothing was passed in flags high word, which is probably why this problem wasn't happening.

3 3

d3ds9_xx
by "Luis C. Busquets Pérez" 08 Dec '07

08 Dec '07

I have not seen any patch committed beginning the implementation of these libraries. Therefore, I was wondering which is the tree structure for these dlls that all of you propose and Alexander is willing to commit.

1 0

Mono 1.2.5.1 on Wine
by Kornél Pál 08 Dec '07

08 Dec '07

Hi, I tried to run Mono 1.2.5.1 on Wine but it dies with the "Weird VirtualQuery result" error message. Are there any know bugs of Wine or Mono that prevent it from running? I would like to make Mono run on Wine and I am willing to contribute patches to Wine and Mono as well to achieve that. Kornél

2 1

re: Wine Problem
by Dan Kegel 08 Dec '07

08 Dec '07

Pedro Ferreira wrote: > I installed a software that talks with the informix client 2.7.0 > everything was running fine, the instalation went with minor problems. > Until now > >when i stated a connection to the informix server wine simply stops Which version of Wine? Have you tested the connection using the ilogin.exe demo that comes with the informix SDK? If you don't have it, you can download a free trial of the 2.80 SDK, that's probably close enough. The procedure for testing the connection is described here: http://www.synametrics.com/ifmxODBC.htm BTW the right mailing list for this is probably wine-users, not wine-devel. - Dan

1 0

Re: [Wine] TortoiseCVS- Unimplemented functions in ntdll.dll causes program to terminate.
by James McKenzie 07 Dec '07

07 Dec '07

Jean-Claude Gervais wrote: > Thank you, Austin! > > I installed Samba to obtain winbind and ntlm_auth, and it did change > the outcome a bit: > > Tortoise still checks out the first file and pops up an error dialog, > so there is no apparent difference, but the session output from Wine HAS > changed, it has gotten quieter: > > wine TortoiseAct.exe CVSCheckOut -f "C:\windows\Temp\TCV1.tmp" -h > 0x300b4 > fixme:actctx:parse_depend_manifests Could not find dependent assembly > L"Microsoft.Windows.Common-Controls" > fixme:richedit:RichEditWndProc_common WM_STYLECHANGING: stub > fixme:richedit:RichEditWndProc_common WM_STYLECHANGED: stub > wine: Call from 0x7bc38828 to unimplemented function > ntdll.dll.NtQueryEaFile, aborting > wine: Call from 0x7bc38828 to unimplemented function > ntdll.dll.NtSetEaFile, aborting > err:mmio:MMIO_ParseExtA No . in szFileName: "TCVS_Error" > > Sadly, it appears that it really is the two unimplemented functions > (NtQueryEaFile and NtSetEaFile) causing the problem. > > Thank you kindly for your help in any case and if you have any other > strategies or ideas to workaround this, I would gladly try them. > > Thanks again. > J > As others have stated here, please file a bug against ntdll.dll and name your program as the source of the problem. It may be possible to get your program to run with a minimum of effort, but this may take considerable effort. The more reports of problems with these functions, the more effort should be brought in to build and implement these functions. It also appears that you are using a program that is dependent on other functions that are implemented elsewhere in the Windows environment. James

2 1

Re: Monthcal lost focus fix
by Alexandre Julliard 07 Dec '07

07 Dec '07

Gregor Brunmar <gregor.brunmar(a)home.se> writes: > diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c > index 8a92d42..e826612 100644 > --- a/dlls/comctl32/monthcal.c > +++ b/dlls/comctl32/monthcal.c > @@ -1719,11 +1719,12 @@ MONTHCAL_Paint(MONTHCAL_INFO *infoPtr, WPARAM wParam) > > > static LRESULT > -MONTHCAL_KillFocus(const MONTHCAL_INFO *infoPtr) > +MONTHCAL_KillFocus(const MONTHCAL_INFO *infoPtr, HWND hFocusWnd) > { > TRACE("\n"); > > - InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); > + if (infoPtr->hwndNotify != hFocusWnd) > + ShowWindow(infoPtr->hwndSelf, SW_HIDE); Is there a reason for removing the InvalidateRect completely? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/5] winealsa: Make widGetPos more accurate
by Alexandre Julliard 07 Dec '07

07 Dec '07

Maarten Lankhorst <maarten(a)codeweavers.com> writes: > --- > dlls/winealsa.drv/wavein.c | 6 +++++- This doesn't work for me: ../../../tools/runtest -q -P wine -M winmm.dll -T ../../.. -p winmm_test.exe.so capture.c && touch capture.ok capture.c:73: Test failed: waveInGetPosition(0): returned 2730 bytes, should be 0 capture.c:84: Test failed: waveInGetPosition(0): returned 2730 samples, should be 0 capture.c:96: Test failed: waveInGetPosition(0): returned 341 ms, should be 0 capture.c:108: Test failed: waveInGetPosition(0): SMPTE test failed capture.c:119: Test failed: waveInGetPosition(0): MIDI test failed capture.c:130: Test failed: waveInGetPosition(0): TICKS test failed [lots more of the same] -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: msi 2: Reimplement MsiGetProductCode
by Alexandre Julliard 07 Dec '07

07 Dec '07

"James Hawkins" <truiken(a)gmail.com> writes: > Changelog: > * Reimplement MsiGetProductCode. The test fails occasionally with something like: ../../../tools/runtest -q -P wine -M msi.dll -T ../../.. -p msi_test.exe.so msi.c && touch msi.ok msi.c:1426: Test failed: Expected {E853FAEA-A4E2-11DC-A19E-001A923592CB}, got {E853FAAE-A4E2-11DC-A19E-001A923592CB} msi.c:1530: Test failed: Expected {E853FAEA-A4E2-11DC-A19E-001A923592CB}, got {E853FAAE-A4E2-11DC-A19E-001A923592CB} make: *** [msi.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Missing 32bit support libraries on x86_64 Debian
by Ben Hodgetts 07 Dec '07

07 Dec '07

I just submitted this to the Debian tracker system, thought it may be useful to echo here in-case anyone else is using x86_64 Debian as it seems since Julliard put in a patch just before .42 to check more completely for dependencies it now shows that Debian (64) actually lacks certain deps for Wine. Ben H. --------------------------------------- Package: wine Version: All Severity: important Wine, when compiled from source (upstream source) shows that Debian is missing certain dependencies which cause loss of functionality in Wine on x86_64. These are libpng, libcups, libcapi20, libhal and openssl. This means that 32bit support packages need to be made for Debian for Wine to work properly (just like there is currently a lib32asound(-dev), etc to give ALSA support). -- System Information: Debian Release: lenny/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 2.6.22-3-amd64 (SMP w/2 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages wine depends on: ii debconf [debconf-2.0] 1.5.17 Debian configuration management sy pn libwine <none> (no description available) ii xbase-clients 1:7.3+7 miscellaneous X clients - metapack Versions of packages wine recommends: ii msttcorefonts 2.4 Installer for Microsoft TrueType c pn wine-utils <none> (no description available)

1 0

Re: Assorted spelling fixes.
by H. Verbeet 07 Dec '07

07 Dec '07

On 07/12/2007, Francois Gouget <fgouget(a)free.fr> wrote: > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > - * out. The nvidia driver only does that if the parameter is inout instead of out, hence the > - * inout. > + * out. The nvidia driver only does that if the parameter is in/out instead of out, hence the > + * in/out. I don't think that change is correct. GLSL function parameters can have qualifiers to specify how the parameter is used. The possible qualifiers are "in", "out" and "inout", where specifying no qualifier is the same as specifying "in". I suppose the first "inout" could be replaced with "in/out" without changing the meaning of the sentence too much, but the second one is a reference to the actual qualifier.

2 1

Re: (corrected) Add 18 pixel strike with japanese fonts to system.sdf Widths corrected and double checked for both strikes
by Huw Davies 07 Dec '07

07 Dec '07

Aric Stewart wrote: > --- > fonts/system.sfd | 1587 > +++++++++++++++++++++++++++++++++++++++++++++--------- > 1 files changed, 1341 insertions(+), 246 deletions(-) You seem to have changed a couple of glyphs in the 16 pixel strike too. Was that on purpose (and if so shouldn't it be a separate patch?). Huw.

2 2

Nifty new valgrind report script. New error in oleaut32. Call for volunteer(s).
by Dan Kegel 07 Dec '07

07 Dec '07

I finally got tired of doing "history | grep diff" etc, and partially automated the daily valgrind run; the resulting script is at http://kegel.com/wine/valgrind/valgrind-daily.sh The results are now in directories named like http://kegel.com/wine/valgrind/logs-2007-12-06/ A summary of the new problems compared to last run are in files named like http://kegel.com/wine/valgrind/logs-2007-12-06-summary.txt And next to each individual result, there is a diff with the previous run, e.g. http://kegel.com/wine/valgrind/logs-2007-12-06/vg-oleaut32_varformat.txt http://kegel.com/wine/valgrind/logs-2007-12-06/vg-oleaut32_varformat-diff.t… To look at what changed since yesterday, start by looking at the day's summary file. In it, there's one line per test, followed by the changes in that test's results, if any. Lines that start with + indicate new problems (boo); lines that start with - indicate old problems that are now gone (yay!) Nearby lines that are identical except for one starting with + and one starting with - indicate a problem that moved, so ignore those. For example, in today's summary, http://kegel.com/wine/valgrind/logs-2007-12-06-summary.txt the first test with changes is in hlink: diff -u logs-2007-12-05/vg-hlink_hlink.txt logs-2007-12-06/vg-hlink_hlink.txt - Syscall param write(buf) points to uninitialised byte(s) That means the hlink test has one fewer error. Yay! The next test with changes is diff -u logs-2007-12-05/vg-ole32_moniker.txt logs-2007-12-06/vg-ole32_moniker.txt + Syscall param write(buf) points to uninitialised byte(s) - Syscall param write(buf) points to uninitialised byte(s) - Conditional jump or move depends on uninitialised value(s) The 'Syscall' error just moved, so that's not really a change. The 'Conditional' error went away, yay! The next test with changes is diff -u logs-2007-12-05/vg-oleaut32_varformat.txt logs-2007-12-06/vg-oleaut32_varformat.txt + Invalid read of size 2 That's a + with no matching -, so it's a new error, boo! Let's see if it's a real error, or just crap in the log. The first thing to check is the diff of that test's results with the last run: http://kegel.com/wine/valgrind/logs-2007-12-06/vg-oleaut32_varformat-diff.t… It shows a fairly convincing new error: + Invalid read of size 2 + at VarFormatFromTokens (varformat.c:1888) + by VarFormat (varformat.c:2096) + by func_varformat (varformat.c:317) + by run_test (test.h:387) + by main (test.h:436) + Address 0x7F00AB01 is 15 bytes before a block of size 8 alloc'd + at RtlAllocateHeap (heap.c:1225) + by SysAllocStringByteLen (oleaut.c:357) + by VariantCopy (variant.c:722) + by VariantChangeTypeEx (variant.c:992) + by VarFormatFromTokens (varformat.c:1884) + by VarFormat (varformat.c:2096) + by func_varformat (varformat.c:317) + by run_test (test.h:387) + by main (test.h:436) Now, sometimes tests are flaky, and errors just happen to come and go, so this doesn't mean for sure it's a new error. But looking back a few days, I don't see it before. So it's probably a new error. Let's see, who's been submitting changes to oleaut32 lately? Only change in git since the last run seems to be http://www.winehq.org/pipermail/wine-cvs/2007-December/038491.html It's not clear how that patch could have caused the error offhand, but it's worth emailing the author and asking him to check, so I've cc'd him. And that's the only new error in the whole run. It's worth watching for new errors and alerting the authors, since the change is fresh in their mind, they'll probably be able to fix it quickly. Egg in the face is a dish best served warm. I'll try to keep running this script daily, but it'd be nice if somebody else took over (and possibly even increased the automation; I still have to do git pull, run the script, and upload by hand.) It doesn't help that valgrind only works well on some machines, but hey, what's life without challenges. - Dan

1 0

Re: gdi32: Update fontsubstitutes and add ms shell dlg 2
by Huw Davies 07 Dec '07

07 Dec '07

On Fri, Dec 07, 2007 at 01:20:59PM +0100, Maarten Lankhorst wrote: > --- > dlls/gdi32/freetype.c | 34 ++++++++++++++++++---------------- > 1 files changed, 18 insertions(+), 16 deletions(-) > diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c > index e9fb663..1542e29 100644 > --- a/dlls/gdi32/freetype.c > +++ b/dlls/gdi32/freetype.c > @@ -1884,83 +1884,83 @@ static const struct nls_update_font_list > const char *oem, *fixed, *system; > const char *courier, *serif, *small, *sserif; > /* these are for font substitute */ > - const char *shelldlg, *tmsrmn; > + const char *shelldlg, *shelldlg2, *tmsrmn; > } nls_update_font_list[] = > { > /* Latin 1 (United States) */ > { 1252, 437, "vgaoem.fon", "vgafix.fon", "vgasys.fon", > "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", > - "Tahoma","Times New Roman", > + "MS Sans Serif", "Tahoma","Times New Roman", > }, I'm fairly sure we don't want to map MS Shell Dlg to MS Sans Serif. Which version of Windows has this mapping? Some map it to Microsoft Sans Serif, but that's a completely different font... Huw. -- Huw Davies huw(a)codeweavers.com

1 0

Re: [2/2] msxml3: Register Missing Components
by Huw Davies 07 Dec '07

07 Dec '07

On Fri, Dec 07, 2007 at 02:07:44PM +1100, Alistair Leslie-Hughes wrote: > diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c > index 9a0d938..1beed5b 100644 > --- a/dlls/msxml3/regsvr.c > +++ b/dlls/msxml3/regsvr.c > @@ -465,13 +465,13 @@ static LONG register_key_defvalueA( > */ > static struct regsvr_coclass const coclass_list[] = { > { &CLSID_DOMDocument, > - "XML DOM Document", > - NULL, > - "msxml3.dll", > - "Both", > - "Microsoft.XMLDOM", > - "1.0" > - }, > + "XML DOM Document", > + NULL, > + "msxml3.dll", > + "Both", > + "Microsoft.XMLDOM", > + "1.0" > + }, There are a lot of white-space changes in this patch. Please re-submit without them. Thanks, Huw. -- Huw Davies huw(a)codeweavers.com

1 0

d3d fill caps oddity
by Christoph Frick 07 Dec '07

07 Dec '07

Hi wined3d devs, i get this message on my notebook (Quadro 570m): fixme:d3d:IWineD3DImpl_FillGLCaps OpenGL implementation supports 32 vertex samplers and 32 total samplers fixme:d3d:IWineD3DImpl_FillGLCaps Expected vertex samplers + MAX_TEXTURES(=8) > combined_samplers does anyone want some traces or other infos? or is this a problem most likely going away with the next nvidia driver update? -- cu

2 1

Re: [1/2] msxml3: Implement IPersistStream
by Robert Shearman 07 Dec '07

07 Dec '07

Alistair Leslie-Hughes wrote: > + hr = CreateStreamOnHGlobal(NULL, TRUE, &This->stream); > + if (FAILED(hr)) > + return hr You need to free This->stream somewhere. -- Rob Shearman

1 0

Re: [5/5] WineD3D: Use the disabled opengl extension string
by H. Verbeet 07 Dec '07

07 Dec '07

The clearest way to do this would probably be to simply do the disabling in a separate loop over the disabled extensions string, similarly to how we detect the extensions.

2 1

wine 0.9.5 IO completion port questions
by Marius Slyzius 07 Dec '07

07 Dec '07

Hello all. I am trying to run ScimoreDB database which uses fibers, non-blocked IO for sockets and files, and completion port. It did started ok under 0.9.5 and seems it is working!!!:), so I would like to verify few things about async IO with completion ports before recompiling it with winelib. 1) will write/read file/socket with completion port is true asynchronous operation. I am asking because every time write/read operation returns true, and never IO pending error. 2) possible bug: the server sends 1500 bytes with WsaSend ( with 2 WSABUFFER ) and the client receive only 1452 bytes and calls WsaRecv again. Also on the server, the completion port receive event that transferred 1452 bytes. However, the last 8 bytes are never sends nor completion port event arrives. Is it perhaps something to do with the VMWare tool where I run Ubuntu 7.10? Please, send me an info also to my mail: marius(a)scimore.com , because I might miss the answer here. Thank you! Marius Slyzius Scimore UAB (+45) 40862122

4 3

replying to wine-devel?
by King InuYasha 07 Dec '07

07 Dec '07

I have noticed some unusual behavior in the wine-devel mailing list compared to others (e.g. fedora's, etc.). Wine's wine-devel mailing list does not automatically set the reply to wine-devel(a)winehq.org. Why is that? If other mailing lists do so, how come Wine's doesn't? Personally, I find myself making a mistake sometimes and not adding in the wine-devel part because I am used to seeing it automatically set. If I remember how emails are set up, isn't there a hidden field called reply-to? AFAICT, other mailing lists either override or rewrite this field and replace it with the email address of the mailing list.

6 8

Re: [5/5] WineD3D: Use the disabled opengl extension string
by Chris Robinson 07 Dec '07

07 Dec '07

On Thursday 06 December 2007 02:05:52 pm Stefan Dösinger wrote: > + if(wined3d_settings.disabled_extensions && > + strstr(wined3d_settings.disabled_extensions, > ThisExtn)) { You need to be careful with this. I read somewhere that using strstr to check for an opengl extension in an extension list is discourage because it can find false positives. Especially in this case, if you have, say: wined3d_settings.disabled_extensions = "GL_NV_texture_shader3 GL_NV_vertex_program2_option GL_NV_vertex_program3" Then if you check for "GL_NV_texture_shader", "GL_NV_vertex_program2", or "GL_NV_vertex_program", they'll all show up as being disabled, when they're not. Which is a double problem because "GL_NV_vertex_program1_1" would still be enabled, which requires "GL_NV_vertex_program". AFAIK, the proper way to check for OpenGL extensions in a space-delimitted list is like this: const char *ptr = strstr(wined3d_settings.disabled_extensions, ThisExtn); if(ptr) { if(ptr == wined3d_settings.disabled_extensions || isspace(ptr[-1])) { int len = strlen(ThisExtn); if(!ptr[len] || isspace(ptr[len])) { /* is disabled */ } } }

1 0

Re: d3dx8 [2/2]: add basic functions for MatrixStack
by Stefan Dösinger 06 Dec '07

06 Dec '07

Am Mittwoch, 5. Dezember 2007 18:13:30 schrieb David.Adam(a)math.cnrs.fr: > This is my first attempt with ICOM objects. So, all the advices are > welcome. A few suggestions: +HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *iface, REFIID riid, void **ppvObject) + ... + IClassFactory_AddRef(iface); It is better to use ID3DXMatrixStack_AddRef(iface) here. It is essentially the same, but it looks more consistent The AddRef() and Release() methods should have a TRACE which write either the new or old refcount, otherwise tracking refcounting bugs is hell.

3 3

Re: msxml3: Implement cloneNode (resend)
by Alexandre Julliard 06 Dec '07

06 Dec '07

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > +static void test_cloneNode(void ) > +{ > + // NOTE TO SELF - r = IXMLDOMNode_selectSingleNode(node, _bstr_("br"), &node); //test Please cleanup that sort of thing before submitting. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: system.sfd: make 18 pixel strike with Japanese jvgasys glyphs
by Dmitry Timoshkov 06 Dec '07

06 Dec '07

"Aric Stewart" <aric(a)codeweavers.com> wrote: > fonts/system.sfd | 1407 > ++++++++++++++++++++++++++++++++++++++++++++++-------- > 1 files changed, 1213 insertions(+), 194 deletions(-) For some reason widths of many glyphs are changed by this patch, that doesn't look correct. -- Dmitry.

3 3

Re: quartz: move current tests into its own test case [1/5]
by James Hawkins 06 Dec '07

06 Dec '07

On Dec 5, 2007 10:35 PM, Lei Zhang <thestig(a)google.com> wrote: > Hi, > > I'm moving the current tests into their own function in preparation to > write more tests. > When submitting a numbered patch series, can you put the numbers [x/y] right after the module name? That makes it easier to spot the ordering of the patches. Thanks, James Hawkins

1 0

Re: secur32: Remove the SECUR32_ALLOC() macro around HeapAlloc().
by Michael Stefaniuc 05 Dec '07

05 Dec '07

Juan Lang wrote: > On Dec 5, 2007 12:52 PM, Michael Stefaniuc <mstefani(a)redhat.de> wrote: >> Checked with Kai and Dmitry and there is nothing special about >> SECUR32_ALLOC(). There are more direct usages of HeapAlloc() >> than of the macro so instead of replacing SECUR32_ALLOC() with >> heap_alloc() just remove it altogether. > > No prob. I introduced those macros some years ago before valgrind was > usable with wine, it made debugging memory leaks (via redefinition of > the macros with special leak-tracking ones) easier. Valgrind is > certainly better. I thought that was still the reason why those $dll_alloc() and now heap_alloc() wrappers are used. I mean the main reason cause we all know that the HeapAlloc() API just sucks. bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 Sr. Network Engineer Fax.: +49-711-96437-111 -------------------------------------------------------------------- Reg. Adresse: Red Hat GmbH, Hauptstätter Strasse 58, 70178 Stuttgart Handelsregister: Amtsgericht Stuttgart HRB 153243 Geschäftsführer: Brendan Lane, Charlie Peters, Michael Cunningham, Werner Knoblich

1 0

A small question regarding cpuid
by Vijay Kiran Kamuju 05 Dec '07

05 Dec '07

Hi, I was going through dlls/kernel32/cpu.c and stumbled upon the functions do_cpuid and have_cpuid. It seems the assembly code for both the Intel and AMD 64 bit processors. Is it possible to remove the ifdefs or add the x86_64 ifdef. And one more question does this change help 64 bit windows support? Thanks, VJ

1 0

Re: wined3d:context.c Check for a context is added
by Stefan Dösinger 05 Dec '07

05 Dec '07

Am Mittwoch, 5. Dezember 2007 17:25:55 schrieb Anatoly Lyutin: > We need to check context before than refer it. > > Changelog: > Check for a context is added Does that happen to fix any game? The idea was that the activeContext pointer never points to NULL, so a check like that only workaround a bug somewhere else

1 0

Re: wined3d:context.c Check for a context is added
by Roderick Colenbrander 05 Dec '07

05 Dec '07

> We need to check context before than refer it. > > Changelog: > Check for a context is added > > -- > Best regards > Anatoly Lyutin. > Hi, I'm not sure if your patch is correct. The block of code in front of the if-statement you added should have found or else created a context. If afterwards there is no context it sounds like something went wrong. Returning NULL isn't correct then. When we just return we keep using the old context (if one was around) which might work for your program but it isn't guaranteed to work at all. So what is the real problem? Regards, Roderick -- Der GMX SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen! Ideal für Modem und ISDN: http://www.gmx.net/de/go/smartsurfer

2 1

Re: dlls/icmp/icmp_main.c -- attempt at fixing regression in r1.30 (RESEND)
by Michael Stefaniuc 05 Dec '07

05 Dec '07

Gerald Pfeifer wrote: > On Wed, 5 Dec 2007, Alexandre Julliard wrote: >> Looks ok, please submit the patch with a proper Changelog entry. > > Thanks for looking into this! Here we go! :-) > ChangeLog: > Correctly handle underflow in IcmpSendEcho(); bug introduced in rev 1.30. Still using cvs? I guess nobody else can do anything with rev 1.30. bye michael > Index: dlls/icmp/icmp_main.c > =================================================================== > RCS file: /home/wine/wine/dlls/icmp/icmp_main.c,v > retrieving revision 1.30 > diff -u -3 -p -r1.30 icmp_main.c > --- dlls/icmp/icmp_main.c 6 Nov 2006 11:51:07 -0000 1.30 > +++ dlls/icmp/icmp_main.c 22 Nov 2007 21:28:59 -0000 > @@ -433,8 +433,9 @@ DWORD WINAPI IcmpSendEcho( > * Decrease the timeout so that we don't enter an endless loop even > * if we get flooded with ICMP packets that are not for us. > */ > - Timeout -= (recv_time - send_time); > - if (Timeout < 0) Timeout = 0; > + DWORD t = (recv_time - send_time); > + if (Timeout > t) Timeout -= t; > + else Timeout = 0; > continue; > } else { > /* This is a reply to our packet */ > > -- Michael Stefaniuc Tel.: +49-711-96437-199 Consulting Communications Engineer Fax.: +49-711-96437-111 -------------------------------------------------------------------- Reg. Adresse: Red Hat GmbH, Hauptstätter Strasse 58, 70178 Stuttgart Handelsregister: Amtsgericht Stuttgart HRB 153243 Geschäftsführer: Brendan Lane, Charlie Peters, Michael Cunningham, Werner Knoblich

1 0

Re: [3/5] shell32: fix buffer sizes
by Alexandre Julliard 05 Dec '07

05 Dec '07

Vitaly Lipatov <lav(a)etersoft.ru> writes: > lstrcpynW needs size in TCHARS > RegEnumKey needs size in TCHARS It would be better to change the HCR_GetDefaultVerbW function to take a len in WCHARs since it's returning a string in all cases. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: dlls/icmp/icmp_main.c -- attempt at fixing regression in r1.30 (RESEND)
by Alexandre Julliard 05 Dec '07

05 Dec '07

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > Since Alexandre has asked me to take care of overflow in some other > context, I figured I could ping this underflow patch in return. ;-) Looks ok, please submit the patch with a proper Changelog entry. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: dlls/icmp/icmp_main.c -- attempt at fixing regression in r1.30 (RESEND)
by Steven Edwards 05 Dec '07

05 Dec '07

Hello, On Dec 4, 2007 7:34 PM, Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > Since Alexandre has asked me to take care of overflow in some other > context, I figured I could ping this underflow patch in return. ;-) > > Gerald > > ---------- Forwarded message ---------- > From: Gerald Pfeifer <gerald(a)pfeifer.com> > To: <wine-patches(a)winehq.org>, Damjan Jovanovic <damjan.jov(a)gmail.com> > Date: Thu, 22 Nov 2007 22:32:08 +0100 (CET) > Subject: dlls/icmp/icmp_main.c -- attempt at fixing regression in r1.30 > > I believe revision 1.30 of dlls/icmp/icmp_main.c > > date: 2006-11-06 11:51:07 +0000; author: julliard; state: Exp; lines: +10 -15; > Damjan Jovanovic <damjan.jov(a)gmail.com> > icmp: Changed select to poll. Could we just revert this patch? I think poll is not a valid api on win32 so this breaks the windows port. I don't really see the need in this change here in the first place. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

dib engine
by Piotr Maceluch 04 Dec '07

04 Dec '07

Hi, what's the status of DIB engine (or where can one read about it)? Are the up-to-date sources still available? What kind of help would be needed? Thanks Peter Maceluch -- -----------=== F O R P S I ===----------- Profesjonalne uslugi, rewelacyjne ceny Sprawdz nas - nowa oferta !! Twoja strona w sieci - od 2 zl http://www.forpsi.pl -----------------------------------------

2 1

Re: dlls/wined3d/state.c -- fix error handling
by Stefan Dösinger 04 Dec '07

04 Dec '07

Am Dienstag, 4. Dezember 2007 01:34:55 schrieb Gerald Pfeifer: > This looks like a mistaken consistency check. The code where mapped_stage > is set looks as follows: > > DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[texUnit]; > > and at other places we do check for -1, so this looks like another bug > in error handling. In fact the texUnitMap entries are never set to any value < 0 other than -1, so it doesn't make much difference, but for the sake of consistency we should check for -1 here as well

1 0

Re: ntdll: detach modules based on inter-module dependencies (try 2)
by Alexandre Julliard 04 Dec '07

04 Dec '07

"Lei Zhang" <thestig(a)google.com> writes: > This patch changes how process_detach() works when called with > bForceDetach set to TRUE. A module would get detached when that module > has no dependencies. After a module gets detached, process_detach() > scans through all the modules and update their dependencies. I'm > assuming there's no circular dependencies between modules. You can't assume that, some modules do have circular dependencies. My suspicion is that this bug should be fixed in winmm, but either way you'll need to show some test cases. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [AppDB] Change licence to AGPL
by Trent Waddington 03 Dec '07

03 Dec '07

interesting. Do you have a list of contributors and their signoff on this license change? Or is it just you two? On Nov 24, 2007 12:36 PM, Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> wrote: > Change licence to AGPL > > > > Alexander N. Sørnes > > > >

6 7

re: kernel32:add ReadFileScatter
by Dan Kegel 03 Dec '07

03 Dec '07

Hey Louis, Focht is using a pseudonym, and I believe it's Wine policy to not accept patches without real names. His patches should be used as guides only, and should not be reposted to wine-patches, until such time as he decloaks. If he doesn't want to decloak, I think we can't use his patches. I rather wish he would avoid attach patches to bugs, as it tempts people into submitting them as you have done, which is a waste of effort given Wine's policy. But I greatly value his ability to describe where and how Wine is wrong. - Dan

4 4

handle unimplemented function stubs
by nessi＠nessi-online.de 03 Dec '07

03 Dec '07

Hello all, I'm a Windows software developer and I'm trying to execute an application under the wine environment. Now I have a problem introduced with wine 0.9.49. I use the function RegOverridePredefKey from the advapi32.dll. To be compatible with older windows versions, I use the following code: LONG WINAPI (*RegOverridePredefKey)(HKEY hKey, HKEY hNewHKey); HMODULE hMod=GetModuleHandle("Advapi32"); if (hMod) (FARPROC)RegOverridePredefKey=GetProcAddress(hMod,"RegOverridePredefKey"); if (RegOverridePredefKey) RegOverridePredefKey(HKEY_CLASSES_ROOT, hKey); In wine 0.9.49 a stub entry for this function was created, but the implementation is missing. The result is, that the GetProcAddress function is successful, but the RegOverridePredefKey call fails. I can catch the EXCEPTION_WINE_STUB exception (see code below), but the application will nevertheless closed. if (RegOverridePredefKey) { long err = ERROR_CALL_NOT_IMPLEMENTED; try { // test for C-based structured exceptions err=RegOverridePredefKey(HKEY_CLASSES_ROOT, hKey); } #define EXCEPTION_WINE_STUB 0x80000100 __except(GetExceptionCode()==EXCEPTION_WINE_STUB ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) { RegOverridePredefKey=NULL; } } What can I do ? I know, that I can find a workaround for this case, but this in not my problem. How can I handle, in principle, such exceptions? What is the reason for creating a function stub without an implementation ??? Thanks Nessi

2 1

Re: rpcrt4: Handle all non-continuable exceptions in CStdStubBuffer_Invoke.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Robert Shearman <rob(a)codeweavers.com> writes: > --- > dlls/rpcrt4/cstub.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > I have a test for this in my tree, which passes on Windows, but > doesn't pass in Wine yet until we have some more proxy/stub code that > I can use to call an object's methods (ideally IClassFactory). This doesn't work: ../../../tools/runtest -q -P wine -M rpcrt4.dll -T ../../.. -p rpcrt4_test.exe.so cstub.c && touch cstub.ok cstub.c:874: Test failed: ret c0000005 make[2]: *** [cstub.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Remove four useless checks in dlls/gdi32/enhmetafile.c (RESEND)
by Alexandre Julliard 03 Dec '07

03 Dec '07

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > One of the really uncontested ones, I think. ;-) > > ---------- Forwarded message ---------- > From: Gerald Pfeifer <gerald(a)pfeifer.com> > To: <wine-patches(a)winehq.org> > Date: Thu, 1 Nov 2007 16:10:03 +0100 (CET) > Subject: Remove four useless checks in dlls/gdi32/enhmetafile.c > > The members of EMRCREATEDIBPATTERNBRUSHPT are of type DWORD, so > comparing them for >= 0 is a noop which always evaluates to true. > > Gerald > > ChangeLog: > Remove four unnecessary comparisions of DWORD variables for >= 0. Validating the record is not unnecessary, it just needs to be done correctly by checking for wraparounds etc. -- Alexandre Julliard julliard(a)winehq.org

2 6

kernel32:add ReadFileScatter
by luis.busquets＠ilidium.com 03 Dec '07

03 Dec '07

Just to add more clarity to the IPR of computer programs and if it is legal to decompile and implement a program again. In Europe, software is protected by Council Directive 91/250/EEC of 14 May 1991 on the legal protection of computer programs (http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:31991L0250:EN:H…). There are a number of things that a software vendor cannot forbid. In particular article 6 speaks about decompilation. It can be done only if the information necessary to achieve interoperability has not previously been readily available (a.1.b) to achieve programs interoperable with the first one (a.1) but not to be used for the development, production or marketing of a computer program substantially similar in its expression (a. 6.2.c). It could be argued that wine is not replicating Windows as it is just the top API. Nevertherless, to avoid any legal problems, it is better to refrain from adding any patches obtained by decompilation.

1 0

xdg_user_dirs patches
by Vijay Kiran Kamuju 03 Dec '07

03 Dec '07

Hi Lei, I think a new file for user dir look up in the shell32 is of no use. Rather than we can add it to the xdg.c and xdg.h, as it contains the generic xdg code for shell32. Its like having all xdg specific code at one place. This is my personal opinion about those patches. Thanks, VJ

9 16

Re: programs/explorer/desktop.c: Add error checking
by Frank Richter 03 Dec '07

03 Dec '07

On 01.12.2007 16:20, Vitaly Lipatov wrote: > UuidToStringW from legacy (DCOM95) rpcrt4.dll returns RPC_S_CANNOT_SUPPORT, > works only ANSI version. > > Changelog: > Add return codes checking for UuidCreate and UuidToStringW Do users still commonly install that legacy DCOM? If so, it may be better to replace UuidToStringW with UuidToStringA so the initialize_display_settings() function continues working (it looks somewhat important, but not sure if it really is). -f.r.

1 0

Re: uninstaller: iterate keys in HKEY_CURRENT_USER also as some programs install their uninstall information there
by James Hawkins 03 Dec '07

03 Dec '07

On Dec 2, 2007 9:07 PM, Aric Stewart <aric(a)codeweavers.com> wrote: > --- > programs/uninstaller/main.c | 34 +++++++++++++++++++++++----------- > 1 files changed, 23 insertions(+), 11 deletions(-) > I'm not saying that this patch shouldn't be accepted, but I want to remark that at some point, all this registry code should be replaced by MsiEnumProducts, MsiGetProductInfo. -- James Hawkins

1 0

Why must the user be the owner of the WINEPREFIX dir?
by Gabriel Sailer 02 Dec '07

02 Dec '07

Hello, after an update of wine on my Debian etch i got the error: libwine: Refuse to use a WINEPREFIX dir owned by a different user. I found that there is a patch in Wine release 0.9.49 but i did not found why this patch is needed. Are the linux access rights not secure enough? I have the full access of the directory and all subdirectories and files. I used the same WinXX Application with wine for a few people (not parallel but serialized) in the same group and gave the WINEPREFIX dir (and all subdirectories and files) to this group. Is it really nesseccary to use this protection? Did i get a security hole without the check? Many thanks for your help Gabriel Sailer -- View this message in context: http://www.nabble.com/Why-must-the-user-be-the-owner-of-the-WINEPREFIX-dir-… Sent from the Wine - Devel mailing list archive at Nabble.com.

2 1

Error while compiling the wine-0.9.49 in RedHat Linux
by manish jaiswal 02 Dec '07

02 Dec '07

While compiling the wine-0.9.49 I am getting these error. Please help me to resolve these error's. winegcc: gcc failed make[2]: *** [winex11.drv.so] Error 2 make[2]: Leaving directory `/home/manish/Desktop/Download/wine-0.9.49/dlls/winex11.drv' make[1]: *** [winex11.drv] Error 2 make[1]: Leaving directory `/home/manish/Desktop/Download/wine-0.9.49/dlls' make: *** [dlls] Error 2 Thanking in anticipation. with regards: Manish Chat on a cool, new interface. No download required. Go to http://in.messenger.yahoo.com/webmessengerpromo.php

6 5

TransGaming's dpnet (DirectPlay 8)
by Gavriel State 02 Dec '07

02 Dec '07

Hi all, On #winehackers the other day, kblin asked about whether TransGaming had a Direct Play implementation. The answer is that we have something that was worked on for a while but never completed. We have had some partial success with it in the initial connection stages, but never pushed it much beyond that. Enclosed here is a patch to today's WineHQ git tree with our dpnet implementation in the hopes that someone finds it useful. Beyond ensuring that it compiles and links, it has not been tested at all with WineHQ. Take care, -Gav -- Gavriel State Founder & CTO TransGaming Inc. gav(a)transgaming.com http://www.transgaming.com Broadening The Playing Field diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index 17929ea..e561796 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -4,18 +4,26 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dpnet.dll IMPORTLIB = libdpnet.$(IMPLIBEXT) -IMPORTS = ole32 user32 advapi32 kernel32 +IMPORTS = ole32 user32 advapi32 kernel32 ws2_32 shlwapi EXTRALIBS = -ldxguid -luuid -C_SRCS = \ - address.c \ +C_SRCS = dpnet_main.c \ + dpnet_classfactory.c \ client.c \ - dpnet_main.c \ peer.c \ - regsvr.c \ - server.c + server.c \ + lobbiedapp.c \ + lobbyclient.c \ + address.c \ + general.c \ + threadpool.c \ + sp_tcpip.c \ + session.c \ + dialog.c \ + debug.c \ + parse.c -RC_SRCS = version.rc +RC_SRCS = hostname_En.rc version.rc @MAKE_DLL_RULES@ diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 0e45b80..a689b53 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -1,7 +1,7 @@ -/* - * DirectPlay8 Address - * - * Copyright 2004 Raphael Junqueira +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,260 +16,899 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * */ -#include "config.h" - #include <stdarg.h> - -#define COBJMACROS +#include <string.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" -#include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "objbase.h" #include "wine/debug.h" +#include "winerror.h" +#include "winnt.h" +#include "wine/unicode.h" + +#define NO_SHLWAPI_STREAM +#include "shlwapi.h" #include "dplay8.h" -#include "dpnet_private.h" +#include "dpaddr.h" +#include "dplay8_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + +static ICOM_VTABLE(IDirectPlay8Address) directPlay8AddressVT; +static ICOM_VTABLE(IDirectPlay8AddressIP) directPlay8AddressIPVT; +static DWORD GetDataType(const WCHAR * name); + +typedef struct dpna_types_t { + int index; + const WCHAR * name; + DWORD type; +} dpna_types_t; + +static dpna_types_t dpna_types[] = { + { 0, DPNA_KEY_PROVIDER, DPNA_DATATYPE_GUID }, + { 1, DPNA_KEY_APPLICATION_INSTANCE, DPNA_DATATYPE_GUID }, + { 2, DPNA_KEY_HOSTNAME, DPNA_DATATYPE_STRING }, + { 3, DPNA_KEY_BAUD, DPNA_DATATYPE_DWORD }, + { 4, DPNA_KEY_DEVICE, DPNA_DATATYPE_GUID }, + { 5, DPNA_KEY_FLOWCONTROL, DPNA_DATATYPE_STRING }, + { 6, DPNA_KEY_NAMEINFO, DPNA_DATATYPE_STRING }, + { 7, DPNA_KEY_NAT_RESOLVER, DPNA_DATATYPE_STRING }, + { 8, DPNA_KEY_NAT_RESOLVER_USER_STRING, DPNA_DATATYPE_STRING }, + { 9, DPNA_KEY_PARITY, DPNA_DATATYPE_STRING }, + { 10, DPNA_KEY_PHONENUMBER, DPNA_DATATYPE_STRING }, + { 11, DPNA_KEY_PORT, DPNA_DATATYPE_DWORD }, + { 12, DPNA_KEY_PROGRAM, DPNA_DATATYPE_GUID }, + { 13, DPNA_KEY_SCOPE, DPNA_DATATYPE_DWORD }, + { 14, DPNA_KEY_STOPBITS, DPNA_DATATYPE_DWORD }, + { 15, DPNA_KEY_TRAVERSALMODE, DPNA_DATATYPE_DWORD } +}; -WINE_DEFAULT_DEBUG_CHANNEL(dpnet); +#define MAX_DPNA_TYPES 16 -/* IDirectPlay8Address IUnknown parts follow: */ -static HRESULT WINAPI IDirectPlay8AddressImpl_QueryInterface(PDIRECTPLAY8ADDRESS iface, REFIID riid, LPVOID *ppobj) +/* convert a guid to a wstr */ +static void guid2wstr(const GUID *guid, LPWSTR wstr) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; + char str[40]; - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectPlay8Address)) { - IUnknown_AddRef(iface); - *ppobj = This; - return DPN_OK; + sprintf(str, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + + MultiByteToWideChar(CP_ACP, 0, str, -1, wstr, 40); +} + +HRESULT WINAPI DirectPlay8Address_QueryInterface(PDIRECTPLAY8ADDRESS iface, + REFIID riid, LPVOID *obj) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IDirectPlay8Address, riid)) + { + This->ref++; + *obj = This; + return S_OK; + } + else if (IsEqualGUID(&IID_IDirectPlay8AddressIP, riid)) + { + This->ref++; + *obj = (LPVOID *)&This->lpVtbl2; + return S_OK; } + else + { + FIXME("(%p)->(%s, %p): no interface\n", iface, debugstr_guid(riid), obj); + return E_NOINTERFACE; + } +} + +ULONG WINAPI DirectPlay8Address_AddRef(PDIRECTPLAY8ADDRESS iface) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + TRACE("(%p)->()\n", iface); + return ++This->ref; +} + +ULONG WINAPI DirectPlay8Address_Release(PDIRECTPLAY8ADDRESS iface) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + TRACE("(%p)->()\n", iface); + if (--This->ref) return This->ref; + + if (This->spData && !This->spDataRelease) FIXME("no release for data @ %p\n", This->spData); + if (This->spData) This->spDataRelease(This->spData); + while (This->component != NULL) { + struct AddressComponent * component = This->component; + This->component = This->component->next; + HeapFree(GetProcessHeap(), 0, component->pwszName); + HeapFree(GetProcessHeap(), 0, component->lpvData); + HeapFree(GetProcessHeap(), 0, component); + } + if (This->dwDataSize > 0) { + HeapFree(GetProcessHeap(), 0, This->pvUserData); + } + HeapFree(GetProcessHeap(), 0, This); + return 0; +} - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; +HRESULT WINAPI DirectPlay8Address_BuildFromURLA(PDIRECTPLAY8ADDRESS iface, CHAR *pszSourceURL) +{ + /* ICOM_THIS(IDirectPlay8AddressImpl, iface); */ + + WCHAR *pwszSourceURL; + INT iUrlStringLen; + HRESULT hr; + + TRACE("(%p)->(%s)\n", iface, debugstr_a(pszSourceURL)); + + iUrlStringLen = strlen(pszSourceURL); + pwszSourceURL = HeapAlloc(GetProcessHeap(), 0, (iUrlStringLen + 1) * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pszSourceURL, iUrlStringLen, pwszSourceURL, + (iUrlStringLen + 1) * sizeof(WCHAR) / sizeof(CHAR)); + + hr = IDirectPlay8Address_BuildFromURLW(iface, pwszSourceURL); + + HeapFree(GetProcessHeap(), 0, pwszSourceURL); + + return hr; } -static ULONG WINAPI IDirectPlay8AddressImpl_AddRef(PDIRECTPLAY8ADDRESS iface) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); +HRESULT WINAPI DirectPlay8Address_BuildFromURLW(PDIRECTPLAY8ADDRESS iface, WCHAR *pwszSourceURL) +{ + /*ICOM_THIS(IDirectPlay8AddressImpl, iface);*/ + WCHAR *provider = NULL; + DWORD providerLen = 0; + GUID guidSP; + int i; + + TRACE("(%p)->(%s)\n", iface, debugstr_w(pwszSourceURL)); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + if (strncmpW(pwszSourceURL, DPNA_HEADER, strlenW(DPNA_HEADER)) != 0) + return DPNERR_INVALIDURL; - return refCount; + /* First, clear the old data out*/ + IDirectPlay8Address_Clear(iface); + + if (DPNET_GetKeyValueW(pwszSourceURL, DPNA_KEY_PROVIDER, provider, &providerLen) + != DPNERR_BUFFERTOOSMALL) + { + return DPNERR_INVALIDURL; + } + + provider = HeapAlloc(GetProcessHeap(), 0, providerLen * sizeof(WCHAR)); + DPNET_GetKeyValueW(pwszSourceURL, DPNA_KEY_PROVIDER, provider, &providerLen); + UrlUnescapeW(provider, NULL, NULL, URL_UNESCAPE_INPLACE); + CLSIDFromString(provider, &guidSP); + HeapFree(GetProcessHeap(), 0, provider); + IDirectPlay8Address_SetSP(iface, &guidSP); + + /* start at 1 so we skip the provider we just added */ + for (i = 1; i < MAX_DPNA_TYPES; i++) { + WCHAR attr[128]; + void * datum = NULL; + DWORD len = 0; + DWORD type; + + strcpyW(attr, dpna_types[i].name); + type = dpna_types[i].type; + if (DPNET_GetKeyValueW(pwszSourceURL, (const WCHAR *)attr, NULL, + &len) == DPNERR_BUFFERTOOSMALL) + { + datum = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + DPNET_GetKeyValueW(pwszSourceURL, attr, datum, &len); + IDirectPlay8Address_AddComponent(iface, attr, datum, len, type); + HeapFree(GetProcessHeap(), 0, datum); + } + } + + return S_OK; } -static ULONG WINAPI IDirectPlay8AddressImpl_Release(PDIRECTPLAY8ADDRESS iface) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); +HRESULT WINAPI DirectPlay8Address_Duplicate(PDIRECTPLAY8ADDRESS iface, PDIRECTPLAY8ADDRESS *ppdpaNewAddress) +{ + /* ICOM_THIS(IDirectPlay8AddressImpl, iface); */ + HRESULT hr; + + TRACE("(%p)->(%p)\n", iface, ppdpaNewAddress); + hr = DPNET_CreateDirectPlay8Address(NULL, &IID_IDirectPlay8Address, (LPVOID *) ppdpaNewAddress); + if (!SUCCEEDED(hr)) + { + TRACE("duplication failed\n"); + return hr; + } - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + hr = IDirectPlay8Address_SetEqual(*ppdpaNewAddress, iface); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); + if (!SUCCEEDED(hr)) + { + IDirectPlay8Address_Release(*ppdpaNewAddress); + *ppdpaNewAddress = NULL; + TRACE("duplication failed\n"); + return hr; } - return refCount; + + TRACE("duplicated\n"); + + return hr; } -/* IDirectPlay8Address Interface follow: */ +HRESULT WINAPI DirectPlay8Address_SetEqual(PDIRECTPLAY8ADDRESS iface, PDIRECTPLAY8ADDRESS pdpaAddress) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + IDirectPlay8AddressImpl *otherThis = (IDirectPlay8AddressImpl *)pdpaAddress; + struct AddressComponent *comp; + struct AddressComponent *last; + + TRACE("(%p)->(%p)\n", iface, pdpaAddress); + + IDirectPlay8Address_Clear(iface); -static HRESULT WINAPI IDirectPlay8AddressImpl_BuildFromURLW(PDIRECTPLAY8ADDRESS iface, WCHAR* pwszSourceURL) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p, %s): stub\n", This, debugstr_w(pwszSourceURL)); - return DPN_OK; + memcpy(&This->guidSP, &otherThis->guidSP, sizeof(GUID)); + memcpy(&This->guidDevice, &otherThis->guidDevice, sizeof(GUID)); + + comp = otherThis->component; + last = NULL; + while (comp) { + struct AddressComponent *component; + component = HeapAlloc(GetProcessHeap(), 0, sizeof(struct AddressComponent)); + component->pwszName = HeapAlloc(GetProcessHeap(), 0, (strlenW(comp->pwszName)+1) * sizeof(WCHAR)); + component->lpvData = HeapAlloc(GetProcessHeap(), 0, comp->dwDataSize); + component->dwDataSize = comp->dwDataSize; + component->dwDataType = comp->dwDataType; + strcpyW(component->pwszName, comp->pwszName); + memcpy(component->lpvData, comp->lpvData, component->dwDataSize); + + component->next = NULL; + + if (last) last->next = component; + else This->component = component; + last = component; + + comp = comp->next; + } + + if (otherThis->spData) otherThis->spDataDuplicate(iface, otherThis->spData); + + return S_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_BuildFromURLA(PDIRECTPLAY8ADDRESS iface, CHAR* pszSourceURL) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p, %s): stub\n", This, pszSourceURL); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_IsEqual(PDIRECTPLAY8ADDRESS iface, PDIRECTPLAY8ADDRESS pdpaAddress) +{ + /* ICOM_THIS(IDirectPlay8AddressImpl, iface); */ + /* IDirectPlay8AddressImpl *otherThis = (IDirectPlay8AddressImpl *)pdpaAddress; */ + + FIXME("(%p)->(%p): stub\n", iface, pdpaAddress); + + return DPNSUCCESS_NOTEQUAL; } -static HRESULT WINAPI IDirectPlay8AddressImpl_Duplicate(PDIRECTPLAY8ADDRESS iface, PDIRECTPLAY8ADDRESS* ppdpaNewAddress) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p, %p): stub\n", This, ppdpaNewAddress); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_Clear(PDIRECTPLAY8ADDRESS iface) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + TRACE("(%p)->()\n", iface); + + while (This->component != NULL) { + struct AddressComponent * component = This->component; + This->component = This->component->next; + HeapFree(GetProcessHeap(), 0, component->pwszName); + HeapFree(GetProcessHeap(), 0, component->lpvData); + HeapFree(GetProcessHeap(), 0, component); + } + if (This->dwDataSize > 0) { + HeapFree(GetProcessHeap(), 0, This->pvUserData); + This->dwDataSize = 0; + } + + if (This->spData) This->spDataRelease(This->spData); + This->spData = NULL; + + return S_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_SetEqual(PDIRECTPLAY8ADDRESS iface, PDIRECTPLAY8ADDRESS pdpaAddress) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p, %p): stub\n", This, pdpaAddress); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_GetURLW(PDIRECTPLAY8ADDRESS iface, WCHAR *pwszURL, PDWORD pdwNumChars) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + DWORD numCharsRequired = 0; + WCHAR * url = NULL; + DWORD i = 1; + DWORD urlsize = 0; + struct AddressComponent *component; + WCHAR wide[1024]; + WCHAR equals[] = {'=', 0}; + WCHAR pound[] = {'#', 0}; + WCHAR semicolon[] = {';', 0}; + + TRACE("(%p)->(%p, %p (%i))\n", iface, pwszURL, pdwNumChars, *pdwNumChars); + + /* If no GUID is set or no components have been added, we're done */ + if (IsEqualGUID(&This->guidSP, &GUID_NULL) || This->component == NULL) { + return DPNERR_INVALIDURL; + } + + /* First compute the size of the URL. This is a pretty rough "guess" and + * will likely be a tad too big but we'll get the "right" number later. */ + component = This->component; + while (component != NULL) { + if (component->dwDataType == GetDataType(component->pwszName)) { + urlsize += component->dwDataSize; + urlsize += strlenW(component->pwszName) + 2; /* include = and ; */ + if (component->dwDataType == DPNA_DATATYPE_GUID) { + urlsize += 6; /* handle escaping */ + } + } + component = component->next; + } + + urlsize += 46; /* for the escaped provider GUID */ + urlsize += strlenW(DPNA_HEADER) + 2; /* include /: */ + urlsize += strlenW(DPNA_KEY_PROVIDER) + 2; /* include = and ; */ + urlsize += This->dwDataSize; /* user data */ + + /* This should always be true, but should still check it */ + if (urlsize > 0) { + DWORD needed = 46; + url = HeapAlloc(GetProcessHeap(), 0, urlsize * sizeof(WCHAR)); + + strcpyW(url, DPNA_HEADER); /* x-directplay:/ */ + strcatW(url, DPNA_KEY_PROVIDER); /* provider */ + strcatW(url, equals); + + StringFromGUID2(&This->guidSP, wide, sizeof(wide)); + UrlEscapeW(wide, url + strlenW(url), &needed, 0); + + strcatW(url, semicolon); + component = This->component; + + while (component != NULL) { + strcatW(url, component->pwszName); + strcatW(url, equals); + switch (component->dwDataType) { + case DPNA_DATATYPE_STRING: + strcatW(url, component->lpvData); + break; + case DPNA_DATATYPE_DWORD: + { + const WCHAR fmt[] = {'%', 'l', 'd', 0}; + wsprintfW(wide, fmt, *((const DWORD *)component->lpvData)); + strcatW(url, wide); + break; + } + case DPNA_DATATYPE_GUID: + { + guid2wstr((GUID*)component->lpvData, wide); + strcatW(url, wide); + } + default: + WARN("Unhandled data type %d\n", component->dwDataType); + break; + } + strcatW(url, semicolon); + i++; + component = component->next; + } /* while */ + } + + /* remove the trailing semi-colon */ + url[strlenW(url)-1] = '\0'; + + if (This->dwDataSize > 0) { + strcatW(url, pound); + strcatW(url, This->pvUserData); + } + + numCharsRequired = strlenW(url) + 1; /* null term */ + if (*pdwNumChars < numCharsRequired) + { + *pdwNumChars = numCharsRequired; + HeapFree(GetProcessHeap(), 0, url); + return DPNERR_BUFFERTOOSMALL; + } + if (pwszURL != NULL) + { + strcpyW(pwszURL, url); + *pdwNumChars = numCharsRequired; + } + HeapFree(GetProcessHeap(), 0, url); + return S_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_IsEqual(PDIRECTPLAY8ADDRESS iface, PDIRECTPLAY8ADDRESS pdpaAddress) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p, %p): stub\n", This, pdpaAddress); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_GetURLA(PDIRECTPLAY8ADDRESS iface, CHAR *pszURL, PDWORD pdwNumChars) +{ + /* ICOM_THIS(IDirectPlay8AddressImpl, iface); */ + DWORD numCharsRequired = 0; + WCHAR * url = NULL; + HRESULT hr; + + TRACE("(%p)->(%p, %p (%i))\n", iface, pszURL, pdwNumChars, *pdwNumChars); + + hr = IDirectPlay8Address_GetURLW(iface, NULL, &numCharsRequired); + if (hr != S_OK && hr != DPNERR_BUFFERTOOSMALL) return hr; + + url = HeapAlloc(GetProcessHeap(), 0, numCharsRequired * sizeof(WCHAR)); + hr = IDirectPlay8Address_GetURLW(iface, url, &numCharsRequired); + if (hr == S_OK) { + INT len = WideCharToMultiByte(CP_ACP, 0, url, numCharsRequired, NULL, 0, NULL, NULL); + if (*pdwNumChars < len) { + *pdwNumChars = len; + hr = DPNERR_BUFFERTOOSMALL; + } else + if (pszURL) { + WideCharToMultiByte(CP_ACP, 0, url, numCharsRequired, pszURL, *pdwNumChars, NULL, NULL); + *pdwNumChars = len; + } + } + HeapFree(GetProcessHeap(), 0, url); + return hr; } -static HRESULT WINAPI IDirectPlay8AddressImpl_Clear(PDIRECTPLAY8ADDRESS iface) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p): stub\n", This); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_GetSP(PDIRECTPLAY8ADDRESS iface, GUID *pguidSP) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + TRACE("(%p)->(%s)\n", iface, debugstr_guid(pguidSP)); + + if (IsEqualGUID(&This->guidSP, &GUID_NULL)) { + return DPNERR_DOESNOTEXIST; + } + memcpy(pguidSP, &This->guidSP, sizeof(GUID)); + return S_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(PDIRECTPLAY8ADDRESS iface, WCHAR* pwszURL, PDWORD pdwNumChars) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p): stub\n", This); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_GetUserData(PDIRECTPLAY8ADDRESS iface, + void *pvUserData, + PDWORD pdwBufferSize +) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + TRACE("(%p)->(%p, %p)\n", iface, pvUserData, pdwBufferSize); + + if (pvUserData == NULL && pdwBufferSize == 0) { + *pdwBufferSize = This->dwDataSize; + return DPNERR_BUFFERTOOSMALL; + } else { + if (*pdwBufferSize < This->dwDataSize) { + *pdwBufferSize = This->dwDataSize; + return DPNERR_BUFFERTOOSMALL; + } + memcpy(pvUserData, This->pvUserData, This->dwDataSize); + /* Size only gets set when in "query" mode */ + if (*pdwBufferSize == 0) + *pdwBufferSize = This->dwDataSize; + } + + return S_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(PDIRECTPLAY8ADDRESS iface, CHAR* pszURL, PDWORD pdwNumChars) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p): stub\n", This); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_SetSP(PDIRECTPLAY8ADDRESS iface, const GUID *const pguidSP) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + TRACE("(%p)->(%s)\n", iface, debugstr_guid(pguidSP)); + memcpy(&This->guidSP, pguidSP, sizeof(GUID)); + return S_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetSP(PDIRECTPLAY8ADDRESS iface, GUID* pguidSP) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p, %p)\n", iface, pguidSP); - memcpy(pguidSP, &This->SP_guid, sizeof(GUID)); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_SetUserData(PDIRECTPLAY8ADDRESS iface, + const void *const pvUserData, + const DWORD dwDataSize) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + TRACE("(%p)->(%s, %d)\n", iface, debugstr_w(pvUserData), dwDataSize); + + if (pvUserData == NULL && dwDataSize != 0) + return DPNERR_NOTALLOWED; + + if (This->dwDataSize > 0) { + HeapFree(GetProcessHeap(), 0, This->pvUserData); + This->dwDataSize = 0; + } + if (pvUserData != NULL) { + This->pvUserData = HeapAlloc(GetProcessHeap(), 0, dwDataSize); + memcpy(This->pvUserData, (void *)pvUserData, dwDataSize); + } else { + This->pvUserData = NULL; + } + This->dwDataSize = dwDataSize; + + return S_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetUserData(PDIRECTPLAY8ADDRESS iface, LPVOID pvUserData, PDWORD pdwBufferSize) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p): stub\n", This); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_GetNumComponents(PDIRECTPLAY8ADDRESS iface, PDWORD pdwNumComponents) +{ + DWORD count = 1; /* DX9 returns the # of components +1 for some reason */ + struct AddressComponent *c; + + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + TRACE("(%p)->(%p)\n", iface, pdwNumComponents); + + c = This->component; + + while (c != NULL) { + count++; + c = c->next; + } + + TRACE("count: %d\n", count); + + *pdwNumComponents = count; + + return S_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_SetSP(PDIRECTPLAY8ADDRESS iface, CONST GUID* CONST pguidSP) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p, %s)\n", iface, debugstr_SP(pguidSP)); - memcpy(&This->SP_guid, pguidSP, sizeof(GUID)); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_GetComponentByName(PDIRECTPLAY8ADDRESS iface, + const WCHAR *const pwszName, + void *pvBuffer, + PDWORD pdwBufferSize, + PDWORD pdwDataType) +{ + struct AddressComponent *component; + HRESULT ret = DPNERR_DOESNOTEXIST; + + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + TRACE("(%p)->(%s, %p, %p (%d), %p)\n", iface, + debugstr_w(pwszName), pvBuffer, pdwBufferSize, + *pdwBufferSize, pdwDataType); + + if (pdwBufferSize == NULL) + return DPNERR_INVALIDPARAM; + + component = This->component; + + while (component != NULL) { + if (!strcmpW(component->pwszName, pwszName)) { + if (*pdwBufferSize >= component->dwDataSize) { + *pdwDataType = component->dwDataType; + if (component->dwDataType == DPNA_DATATYPE_STRING) { + strcpyW(pvBuffer, component->lpvData); + } else + memcpy(pvBuffer, component->lpvData, component->dwDataSize); + ret = S_OK; + } else { + ret = DPNERR_BUFFERTOOSMALL; + } + *pdwBufferSize = component->dwDataSize; + break; + } + component = component->next; + } + + TRACE("returning %x\n", ret); + return ret; } -static HRESULT WINAPI IDirectPlay8AddressImpl_SetUserData(PDIRECTPLAY8ADDRESS iface, CONST void* CONST pvUserData, CONST DWORD dwDataSize) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p): stub\n", This); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_GetComponentByIndex(PDIRECTPLAY8ADDRESS iface, + const DWORD dwComponentID, + WCHAR *pwszName, + PDWORD pdwNameLen, + void *pvBuffer, + PDWORD pdwBufferSize, + PDWORD pdwDataType +) +{ + struct AddressComponent *component; + HRESULT ret = DPNERR_DOESNOTEXIST; + int i = 0; + + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + TRACE("(%p)->(%d, %p, %p, %p, %p, %p)\n", iface, dwComponentID, + pwszName, pdwNameLen, pvBuffer, pdwBufferSize, + pdwDataType); + + if (pdwBufferSize == NULL || pdwNameLen == NULL) + return DPNERR_INVALIDPARAM; + + component = This->component; + + while (component != NULL && i < dwComponentID - 1) { + i++; + component = component->next; + } + if (component) { + if (*pdwBufferSize >= component->dwDataSize && *pdwNameLen >= strlenW(component->pwszName)) { + *pdwDataType = component->dwDataType; + memcpy(pvBuffer, component->lpvData, component->dwDataSize); + strcpyW(pwszName, component->pwszName); + ret = S_OK; + } else { + ret = DPNERR_BUFFERTOOSMALL; + } + *pdwBufferSize = component->dwDataSize; + *pdwNameLen = strlenW(component->pwszName); + } + + TRACE("returning %x len=%d\n", ret, *pdwBufferSize); + + return ret; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetNumComponents(PDIRECTPLAY8ADDRESS iface, PDWORD pdwNumComponents) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p): stub\n", This); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_AddComponent(PDIRECTPLAY8ADDRESS iface, + const WCHAR *const pwszName, + const void *const lpvData, + const DWORD dwDataSize, + const DWORD dwDataType) +{ + struct AddressComponent *component; + int found = 0; + + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + TRACE("(%p)->(%s, %p, %d, %d)\n", iface, + debugstr_w(pwszName), lpvData, + dwDataSize, dwDataType); + + if (dwDataType != GetDataType(pwszName)) { + TRACE("=> invalidparam\n"); + return DPNERR_INVALIDPARAM; + } + + component = This->component; + while (component) { + if (!strcmpW(component->pwszName, pwszName)) { + HeapFree(GetProcessHeap(), 0, component->pwszName); + HeapFree(GetProcessHeap(), 0, component->lpvData); + found = 1; + break; + } + component = component->next; + } + if (!found) + component = HeapAlloc(GetProcessHeap(), 0, sizeof(struct AddressComponent)); + component->pwszName = HeapAlloc(GetProcessHeap(), 0, (strlenW(pwszName)+1) * sizeof(WCHAR)); + component->lpvData = HeapAlloc(GetProcessHeap(), 0, dwDataSize); + component->dwDataSize = dwDataSize; + component->dwDataType = dwDataType; + strcpyW(component->pwszName, pwszName); + + switch(dwDataType) { + case DPNA_DATATYPE_STRING: + strcpyW(component->lpvData, lpvData); + TRACE("string is %s\n", debugstr_w(lpvData)); + break; + case DPNA_DATATYPE_DWORD: + TRACE("%d (%d)\n", *((const DWORD *)lpvData), dwDataSize); + default: + memcpy(component->lpvData, lpvData, dwDataSize); + break; + } + + if (found) { /* we are updating an existing entry */ + return S_OK; + } + + component->next = NULL; + + /* Put new element onto the end of the list. This is necessary so the user + * can call GetComponentByIndex and expect the component to be stored in + * the order it was added. */ + if (This->component == NULL) { + This->component = component; + } else { + struct AddressComponent *temp; + temp = This->component; + while (temp->next != NULL) { + temp = temp->next; + } + temp->next = component; + } + + return S_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(PDIRECTPLAY8ADDRESS iface, CONST WCHAR* CONST pwszName, LPVOID pvBuffer, PDWORD pdwBufferSize, PDWORD pdwDataType) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p): stub\n", This); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_SetDevice(PDIRECTPLAY8ADDRESS iface, const GUID *const pguidDevice) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + TRACE("(%p)->(%s)\n", iface, debugstr_guid(pguidDevice)); + memcpy(&This->guidDevice, pguidDevice, sizeof(GUID)); + return S_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByIndex(PDIRECTPLAY8ADDRESS iface, CONST DWORD dwComponentID, WCHAR* pwszName, - PDWORD pdwNameLen, void* pvBuffer, PDWORD pdwBufferSize, PDWORD pdwDataType) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p): stub\n", This); - return DPN_OK; +HRESULT WINAPI DirectPlay8Address_GetDevice(PDIRECTPLAY8ADDRESS iface, GUID *pguidDevice) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + TRACE("(%p)->(%p)\n", iface, pguidDevice); + if (IsEqualGUID(&This->guidDevice, &GUID_NULL)) { + return DPNERR_DOESNOTEXIST; + } + memcpy(pguidDevice, &This->guidDevice, sizeof(GUID)); + return S_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(PDIRECTPLAY8ADDRESS iface, CONST WCHAR* CONST pwszName, - CONST void* CONST lpvData, CONST DWORD dwDataSize, CONST DWORD dwDataType) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p, %s, %p, %u, %x): stub\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType); - - if (NULL == lpvData) return DPNERR_INVALIDPOINTER; - switch (dwDataType) { - case DPNA_DATATYPE_DWORD: - if (sizeof(DWORD) != dwDataSize) return DPNERR_INVALIDPARAM; - TRACE("(%p, %u): DWORD Type -> %u\n", lpvData, dwDataSize, *(const DWORD*) lpvData); - break; - case DPNA_DATATYPE_GUID: - if (sizeof(GUID) != dwDataSize) return DPNERR_INVALIDPARAM; - TRACE("(%p, %u): GUID Type -> %s\n", lpvData, dwDataSize, debugstr_guid((const GUID*) lpvData)); - break; - case DPNA_DATATYPE_STRING: - TRACE("(%p, %u): STRING Type -> %s\n", lpvData, dwDataSize, (const CHAR*) lpvData); - break; - case DPNA_DATATYPE_BINARY: - TRACE("(%p, %u): BINARY Type\n", lpvData, dwDataSize); - break; - } - - return DPN_OK; +HRESULT DPNET_CreateDirectPlay8Address(IUnknown *pOuter, REFIID riid, LPVOID *ppobj) +{ + IDirectPlay8AddressImpl *ipDP8A; + HRESULT hr; + TRACE("()\n"); + ipDP8A = (IDirectPlay8AddressImpl *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(IDirectPlay8AddressImpl)); + if (ipDP8A == NULL) return E_OUTOFMEMORY; + ICOM_VTBL(ipDP8A) = &directPlay8AddressVT; + ipDP8A->lpVtbl2 = &directPlay8AddressIPVT; + IDirectPlay8Address_AddRef((IDirectPlay8Address *)ipDP8A); + ipDP8A->component = NULL; + ipDP8A->pvUserData = NULL; + ipDP8A->dwDataSize = 0; + ipDP8A->guidDevice = GUID_NULL; + ipDP8A->guidSP = GUID_NULL; + TRACE("Created new object: %p\n", ipDP8A); + hr = IDirectPlay8Address_QueryInterface((IDirectPlay8Address *)ipDP8A, riid, ppobj); + IDirectPlay8Address_Release((IDirectPlay8Address *)ipDP8A); + + ipDP8A->hDialogMutex = CreateMutexA(NULL, FALSE, "DPNET Address DialogMutex"); + if (SUCCEEDED(hr)) + return S_OK; + else + return E_NOINTERFACE; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetDevice(PDIRECTPLAY8ADDRESS iface, GUID* pDevGuid) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p): stub\n", This); - return DPN_OK; +/* DirectPlayAddressIP wrappers */ +HRESULT WINAPI DirectPlay8AddressIP_QueryInterface(PDIRECTPLAY8ADDRESSIP iface, + REFIID riid, LPVOID *obj) +{ + ICOM_THIS_MULTI(IDirectPlay8AddressImpl, lpVtbl2, iface); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + return IDirectPlay8Address_QueryInterface((PDIRECTPLAY8ADDRESS) This, riid, obj); } -static HRESULT WINAPI IDirectPlay8AddressImpl_SetDevice(PDIRECTPLAY8ADDRESS iface, CONST GUID* CONST devGuid) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p, %s): stub\n", This, debugstr_guid(devGuid)); - return DPN_OK; +ULONG WINAPI DirectPlay8AddressIP_AddRef(PDIRECTPLAY8ADDRESSIP iface) +{ + ICOM_THIS_MULTI(IDirectPlay8AddressImpl, lpVtbl2, iface); + TRACE("(%p)->()\n", iface); + return IDirectPlay8Address_AddRef((PDIRECTPLAY8ADDRESS) This); } -static HRESULT WINAPI IDirectPlay8AddressImpl_BuildFromDirectPlay4Address(PDIRECTPLAY8ADDRESS iface, LPVOID pvAddress, DWORD dwDataSize) { - IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; - TRACE("(%p): stub\n", This); - return DPN_OK; +ULONG WINAPI DirectPlay8AddressIP_Release(PDIRECTPLAY8ADDRESSIP iface) +{ + ICOM_THIS_MULTI(IDirectPlay8AddressImpl, lpVtbl2, iface); + TRACE("(%p)->()\n", iface); + return IDirectPlay8Address_Release((PDIRECTPLAY8ADDRESS) This); } -static const IDirectPlay8AddressVtbl DirectPlay8Address_Vtbl = +static ICOM_VTABLE(IDirectPlay8Address) directPlay8AddressVT = { - IDirectPlay8AddressImpl_QueryInterface, - IDirectPlay8AddressImpl_AddRef, - IDirectPlay8AddressImpl_Release, - IDirectPlay8AddressImpl_BuildFromURLW, - IDirectPlay8AddressImpl_BuildFromURLA, - IDirectPlay8AddressImpl_Duplicate, - IDirectPlay8AddressImpl_SetEqual, - IDirectPlay8AddressImpl_IsEqual, - IDirectPlay8AddressImpl_Clear, - IDirectPlay8AddressImpl_GetURLW, - IDirectPlay8AddressImpl_GetURLA, - IDirectPlay8AddressImpl_GetSP, - IDirectPlay8AddressImpl_GetUserData, - IDirectPlay8AddressImpl_SetSP, - IDirectPlay8AddressImpl_SetUserData, - IDirectPlay8AddressImpl_GetNumComponents, - IDirectPlay8AddressImpl_GetComponentByName, - IDirectPlay8AddressImpl_GetComponentByIndex, - IDirectPlay8AddressImpl_AddComponent, - IDirectPlay8AddressImpl_GetDevice, - IDirectPlay8AddressImpl_SetDevice, - IDirectPlay8AddressImpl_BuildFromDirectPlay4Address + DirectPlay8Address_QueryInterface, + DirectPlay8Address_AddRef, + DirectPlay8Address_Release, + DirectPlay8Address_BuildFromURLW, + DirectPlay8Address_BuildFromURLA, + DirectPlay8Address_Duplicate, + DirectPlay8Address_SetEqual, + DirectPlay8Address_IsEqual, + DirectPlay8Address_Clear, + DirectPlay8Address_GetURLW, + DirectPlay8Address_GetURLA, + DirectPlay8Address_GetSP, + DirectPlay8Address_GetUserData, + DirectPlay8Address_SetSP, + DirectPlay8Address_SetUserData, + DirectPlay8Address_GetNumComponents, + DirectPlay8Address_GetComponentByName, + DirectPlay8Address_GetComponentByIndex, + DirectPlay8Address_AddComponent, + DirectPlay8Address_GetDevice, + DirectPlay8Address_SetDevice, + (void*)0xdead7016 /* BuildFromDirectPlay4Address */ +}; + +static ICOM_VTABLE(IDirectPlay8AddressIP) directPlay8AddressIPVT = +{ + DirectPlay8AddressIP_QueryInterface, + DirectPlay8AddressIP_AddRef, + DirectPlay8AddressIP_Release, + (void*)0xdead7024, /* BuildFromSockAddr */ + (void*)0xdead7025, /* BuildFromAddress */ + (void*)0xdead7026, /* BuildLocalAddress */ + (void*)0xdead7027, /* GetSockAddress */ + (void*)0xdead7028, /* GetLocalAddress */ + (void*)0xdead7029 /* GetAddress */ }; -HRESULT DPNET_CreateDirectPlay8Address(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { - IDirectPlay8AddressImpl* client; - - TRACE("(%p, %s, %p)\n", punkOuter, debugstr_guid(riid), ppobj); - - client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8AddressImpl)); - if (NULL == client) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - client->lpVtbl = &DirectPlay8Address_Vtbl; - client->ref = 0; /* will be inited with QueryInterface */ - return IDirectPlay8AddressImpl_QueryInterface ((PDIRECTPLAY8ADDRESS)client, riid, ppobj); -} - -/* returns name of given GUID */ -const char *debugstr_SP(const GUID *id) { - static const guid_info guids[] = { - /* CLSIDs */ - GE(CLSID_DP8SP_IPX), - GE(CLSID_DP8SP_TCPIP), - GE(CLSID_DP8SP_SERIAL), - GE(CLSID_DP8SP_MODEM) - }; - unsigned int i; - - if (!id) return "(null)"; - - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { - if (IsEqualGUID(id, &guids[i].guid)) - return guids[i].name; - } - /* if we didn't find it, act like standard debugstr_guid */ - return debugstr_guid(id); +/* private functions. used by the rest of dpnet. + * Ideally should be in an interface */ +HRESULT DPNET_Address_SetSPData(PDIRECTPLAY8ADDRESS iface, void *data, + spReleaseAddressInfo spReleaseCallback, + spDuplicateAddressInfo spDuplicateCallback) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + if (This->spData && This->spDataRelease) This->spDataRelease(This->spData); + This->spData = data; + This->spDataRelease = spReleaseCallback; + This->spDataDuplicate = spDuplicateCallback; + return S_OK; +} + +HRESULT DPNET_Address_GetSPData(PDIRECTPLAY8ADDRESS iface, void **data) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + *data = This->spData; + return S_OK; +} + +HRESULT DPNET_Address_GetDialogLock(PDIRECTPLAY8ADDRESS iface) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + if (WaitForSingleObject(This->hDialogMutex, INFINITE) != WAIT_OBJECT_0) + return E_FAIL; + return S_OK; +} + +HRESULT DPNET_Address_ReleaseDialogLock(PDIRECTPLAY8ADDRESS iface) +{ + ICOM_THIS(IDirectPlay8AddressImpl, iface); + + ReleaseMutex(This->hDialogMutex); + return S_OK; +} + +/* utility functions for parsing URLs */ + +HRESULT DPNET_GetKeyValueW(const WCHAR *url, const WCHAR *keyName, + WCHAR *keyValue /* [OUT] */, + PDWORD bufferLen /* [IN OUT] */) +{ + WCHAR *p, *p2, *p3; + DWORD requiredLen; + + TRACE("%s, %p, %s, %p (%i)\n", debugstr_w(url), keyName, + debugstr_w(keyValue), bufferLen, *bufferLen); + + p = strstrW(url, keyName); + + if (p == NULL) return DPNERR_DOESNOTEXIST; + + p = strchrW(p, DPNA_SEPARATOR_KEYVALUE); + + if (p == NULL) return DPNERR_DOESNOTEXIST; + p++; + + p2 = strchrW(p, DPNA_SEPARATOR_COMPONENT); + p3 = strchrW(p, DPNA_SEPARATOR_USERDATA); + if (p2 == NULL && p3 == NULL) /* end of string */ + requiredLen = strlenW(p); + else if (p2 == NULL) + requiredLen = p3 - p; + else if (p3 == NULL) + requiredLen = p2 - p; + else + requiredLen = (p2 < p3 ? p2 : p3) - p; + + if (*bufferLen < requiredLen) + { + *bufferLen = requiredLen; + return DPNERR_BUFFERTOOSMALL; + } + lstrcpynW(keyValue, p, requiredLen); + keyValue[requiredLen] = 0; + + return DPN_OK; +} + +static DWORD GetDataType(const WCHAR * name) +{ + int i; + + for (i = 0; i < MAX_DPNA_TYPES; i++) { + if (!strcmpW(name, dpna_types[i].name)) { + return dpna_types[i].type; + } + } + + return -1; } diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 89e87e6..1e0ceba 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -1,7 +1,7 @@ -/* - * DirectPlay8 Client - * - * Copyright 2004 Raphael Junqueira +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,252 +16,106 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * */ -#include "config.h" - #include <stdarg.h> +#include <string.h> -#define COBJMACROS #include "windef.h" #include "winbase.h" -#include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "objbase.h" #include "wine/debug.h" +#include "winerror.h" #include "dplay8.h" -#include "dpnet_private.h" +#include "dplay8_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(dpnet); +WINE_DEFAULT_DEBUG_CHANNEL(dplay); -/* IDirectPlay8Client IUnknown parts follow: */ -static HRESULT WINAPI IDirectPlay8ClientImpl_QueryInterface(PDIRECTPLAY8CLIENT iface, REFIID riid, LPVOID *ppobj) -{ - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; +static ICOM_VTABLE(IDirectPlay8Client) directPlay8ClientVT; - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectPlay8Client)) { - IUnknown_AddRef(iface); - *ppobj = This; - return DPN_OK; +HRESULT WINAPI DirectPlay8Client_QueryInterface(PDIRECTPLAY8CLIENT iface, + REFIID riid, LPVOID *obj) +{ + ICOM_THIS(IDirectPlay8ClientImpl, iface); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IDirectPlay8Client, riid)) + { + This->ref++; + *obj = This; + return S_OK; } - - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectPlay8ClientImpl_AddRef(PDIRECTPLAY8CLIENT iface) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); - - return refCount; -} - -static ULONG WINAPI IDirectPlay8ClientImpl_Release(PDIRECTPLAY8CLIENT iface) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); - - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); + else + { + FIXME("(%p)->(%s, %p): no interface\n", iface, debugstr_guid(riid), obj); + return E_NOINTERFACE; } - return refCount; -} - -/* IDirectPlay8Client Interface follow: */ - -static HRESULT WINAPI IDirectPlay8ClientImpl_Initialize(PDIRECTPLAY8CLIENT iface, PVOID CONST pvUserContext, CONST PFNDPNMESSAGEHANDLER pfn, CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%p,%p,%x): Stub\n", This, pvUserContext, pfn, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_EnumServiceProviders(PDIRECTPLAY8CLIENT iface, - CONST GUID * CONST pguidServiceProvider, - CONST GUID * CONST pguidApplication, - DPN_SERVICE_PROVIDER_INFO * CONST pSPInfoBuffer, - PDWORD CONST pcbEnumData, - PDWORD CONST pcReturned, - CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_EnumHosts(PDIRECTPLAY8CLIENT iface, - PDPN_APPLICATION_DESC CONST pApplicationDesc, - IDirectPlay8Address * CONST pAddrHost, - IDirectPlay8Address * CONST pDeviceInfo, - PVOID CONST pUserEnumData, CONST DWORD dwUserEnumDataSize, CONST DWORD dwEnumCount, - CONST DWORD dwRetryInterval, - CONST DWORD dwTimeOut, - PVOID CONST pvUserContext, - DPNHANDLE * CONST pAsyncHandle, - CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - /*FIXME("(%p):(%p,%p,%p,%p,%lu,%lu,%lu,%lu): Stub\n", This, pApplicationDesc, pAddrHost, pDeviceInfo, pUserEnumData, dwUserEnumDataSize, dwEnumCount, dwRetryInterval, dwTimeOut);*/ - FIXME("(%p):(%p,%p,%x): Stub\n", This, pvUserContext, pAsyncHandle, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_CancelAsyncOperation(PDIRECTPLAY8CLIENT iface, CONST DPNHANDLE hAsyncHandle, CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%u,%x): Stub\n", This, hAsyncHandle, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_Connect(PDIRECTPLAY8CLIENT iface, - CONST DPN_APPLICATION_DESC * CONST pdnAppDesc, - IDirectPlay8Address * CONST pHostAddr, - IDirectPlay8Address * CONST pDeviceInfo, - CONST DPN_SECURITY_DESC * CONST pdnSecurity, - CONST DPN_SECURITY_CREDENTIALS * CONST pdnCredentials, - CONST void * CONST pvUserConnectData, - CONST DWORD dwUserConnectDataSize, - void * CONST pvAsyncContext, - DPNHANDLE * CONST phAsyncHandle, - CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%p,%p,%x): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_Send(PDIRECTPLAY8CLIENT iface, - CONST DPN_BUFFER_DESC * CONST prgBufferDesc, - CONST DWORD cBufferDesc, - CONST DWORD dwTimeOut, - void * CONST pvAsyncContext, - DPNHANDLE * CONST phAsyncHandle, - CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%p,%p,%x): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_GetSendQueueInfo(PDIRECTPLAY8CLIENT iface, DWORD * CONST pdwNumMsgs, DWORD * CONST pdwNumBytes, CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_GetApplicationDesc(PDIRECTPLAY8CLIENT iface, DPN_APPLICATION_DESC * CONST pAppDescBuffer, DWORD * CONST pcbDataSize, CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_SetClientInfo(PDIRECTPLAY8CLIENT iface, - CONST DPN_PLAYER_INFO * CONST pdpnPlayerInfo, - PVOID CONST pvAsyncContext, - DPNHANDLE * CONST phAsyncHandle, - CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%p,%p,%x): Stub\n", This, pvAsyncContext, phAsyncHandle, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_GetServerInfo(PDIRECTPLAY8CLIENT iface, DPN_PLAYER_INFO * CONST pdpnPlayerInfo, DWORD * CONST pdwSize, CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_GetServerAddress(PDIRECTPLAY8CLIENT iface, IDirectPlay8Address ** CONST pAddress, CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_Close(PDIRECTPLAY8CLIENT iface, CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; } -static HRESULT WINAPI IDirectPlay8ClientImpl_ReturnBuffer(PDIRECTPLAY8CLIENT iface, CONST DPNHANDLE hBufferHandle, CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_GetCaps(PDIRECTPLAY8CLIENT iface, DPN_CAPS * CONST pdpCaps, CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_SetCaps(PDIRECTPLAY8CLIENT iface, CONST DPN_CAPS * CONST pdpCaps, CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; -} - -static HRESULT WINAPI IDirectPlay8ClientImpl_SetSPCaps(PDIRECTPLAY8CLIENT iface, CONST GUID * CONST pguidSP, CONST DPN_SP_CAPS * CONST pdpspCaps, CONST DWORD dwFlags ) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; +ULONG WINAPI DirectPlay8Client_AddRef(PDIRECTPLAY8CLIENT iface) +{ + ICOM_THIS(IDirectPlay8ClientImpl, iface); + TRACE("(%p)->()\n", iface); + return ++This->ref; } -static HRESULT WINAPI IDirectPlay8ClientImpl_GetSPCaps(PDIRECTPLAY8CLIENT iface, CONST GUID * CONST pguidSP, DPN_SP_CAPS * CONST pdpspCaps, CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; -} +ULONG WINAPI DirectPlay8Client_Release(PDIRECTPLAY8CLIENT iface) +{ + ICOM_THIS(IDirectPlay8ClientImpl, iface); + TRACE("(%p)->()\n", iface); + if (--This->ref) return This->ref; -static HRESULT WINAPI IDirectPlay8ClientImpl_GetConnectionInfo(PDIRECTPLAY8CLIENT iface, DPN_CONNECTION_INFO * CONST pdpConnectionInfo, CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; -} + FIXME("destroy this and everything\n"); -static HRESULT WINAPI IDirectPlay8ClientImpl_RegisterLobby(PDIRECTPLAY8CLIENT iface, CONST DPNHANDLE dpnHandle, struct IDirectPlay8LobbiedApplication * CONST pIDP8LobbiedApplication, CONST DWORD dwFlags) { - IDirectPlay8ClientImpl *This = (IDirectPlay8ClientImpl *)iface; - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; + HeapFree(GetProcessHeap(), 0, This); + return 0; } -static const IDirectPlay8ClientVtbl DirectPlay8Client_Vtbl = +HRESULT DPNET_CreateDirectPlay8Client(IUnknown *pOuter, REFIID riid, LPVOID *ppobj) { - IDirectPlay8ClientImpl_QueryInterface, - IDirectPlay8ClientImpl_AddRef, - IDirectPlay8ClientImpl_Release, - IDirectPlay8ClientImpl_Initialize, - IDirectPlay8ClientImpl_EnumServiceProviders, - IDirectPlay8ClientImpl_EnumHosts, - IDirectPlay8ClientImpl_CancelAsyncOperation, - IDirectPlay8ClientImpl_Connect, - IDirectPlay8ClientImpl_Send, - IDirectPlay8ClientImpl_GetSendQueueInfo, - IDirectPlay8ClientImpl_GetApplicationDesc, - IDirectPlay8ClientImpl_SetClientInfo, - IDirectPlay8ClientImpl_GetServerInfo, - IDirectPlay8ClientImpl_GetServerAddress, - IDirectPlay8ClientImpl_Close, - IDirectPlay8ClientImpl_ReturnBuffer, - IDirectPlay8ClientImpl_GetCaps, - IDirectPlay8ClientImpl_SetCaps, - IDirectPlay8ClientImpl_SetSPCaps, - IDirectPlay8ClientImpl_GetSPCaps, - IDirectPlay8ClientImpl_GetConnectionInfo, - IDirectPlay8ClientImpl_RegisterLobby + IDirectPlay8ClientImpl *ipDP8C; + HRESULT hr; + TRACE("()\n"); + ipDP8C = (IDirectPlay8ClientImpl *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(IDirectPlay8ClientImpl)); + if (ipDP8C == NULL) return E_OUTOFMEMORY; + ICOM_VTBL(ipDP8C) = &directPlay8ClientVT; + IDirectPlay8Client_AddRef((IDirectPlay8Client *)ipDP8C); + TRACE("Created new interface: %p\n", ipDP8C); + hr = IDirectPlay8Client_QueryInterface((IDirectPlay8Client *)ipDP8C, riid, ppobj); + IDirectPlay8Client_Release((IDirectPlay8Client *)ipDP8C); + if (SUCCEEDED(hr)) + return S_OK; + else + return E_NOINTERFACE; +} + +static ICOM_VTABLE(IDirectPlay8Client) directPlay8ClientVT = +{ + DirectPlay8Client_QueryInterface, + DirectPlay8Client_AddRef, + DirectPlay8Client_Release, + (void*)0xdead3004, /* Initilize */ + (void*)0xdead3005, /* EnumServiceProviers */ + (void*)0xdead3006, /* EnumHosts */ + (void*)0xdead3007, /* CancelAsyncOperation */ + (void*)0xdead3008, /* Connect */ + (void*)0xdead3009, /* Send */ + (void*)0xdead300a, /* GetSendQueueInfo */ + (void*)0xdead300b, /* GetApplicationDesc */ + (void*)0xdead300c, /* SetClientInfo */ + (void*)0xdead300d, /* GetServerInfo */ + (void*)0xdead300e, /* GetServerAddress */ + (void*)0xdead300f, /* Close */ + (void*)0xdead3010, /* ReturnBuffer */ + (void*)0xdead3011, /* GetCaps */ + (void*)0xdead3012, /* SetCaps */ + (void*)0xdead3013, /* SetSPCaps */ + (void*)0xdead3014, /* GetSPCaps */ + (void*)0xdead3015, /* GetConnectionInfo */ + (void*)0xdead3016 /* RegisterLobby */ }; -HRESULT DPNET_CreateDirectPlay8Client(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { - IDirectPlay8ClientImpl* client; - - TRACE("(%p, %s, %p)\n", punkOuter, debugstr_guid(riid), ppobj); - - client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ClientImpl)); - if (NULL == client) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - client->lpVtbl = &DirectPlay8Client_Vtbl; - client->ref = 0; /* will be inited with QueryInterface */ - return IDirectPlay8ClientImpl_QueryInterface ((PDIRECTPLAY8CLIENT)client, riid, ppobj); -} diff --git a/dlls/dpnet/debug.c b/dlls/dpnet/debug.c new file mode 100644 index 0000000..1a8ca78 --- /dev/null +++ b/dlls/dpnet/debug.c @@ -0,0 +1,57 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +#include <ctype.h> + +void debug_hexdump(void *data, unsigned long len) +{ + unsigned int i; + char *cdata = (char *)data; + char textout[16]; + + for (i = 0; i < len; i++) + { + if ((i % 8) == 0 && i) DPRINTF(" "); + if ((i % 16) == 0 && i) DPRINTF(" '%.8s' '%.8s'\n", &textout[0], &textout[8]); + textout[i % 16] = (cdata[i] && isprint(cdata[i])) ? cdata[i] : '.'; + DPRINTF("%02hhx ", cdata[i]); + } + if (i % 16) + { + unsigned int j; + for (j = 0; j < (16 - (i % 16)); j++) + { + if (((16 - (i % 16)) - j) == 8) DPRINTF(" "); + DPRINTF(".. "); + } + DPRINTF(" '"); + for (j = 0; j < (i % 16); j++) + { + DPRINTF("%c", textout[j]); + if (j == 8) DPRINTF("' '"); + } + DPRINTF("'\n"); + } + DPRINTF("\n"); + +} + diff --git a/dlls/dpnet/dialog.c b/dlls/dpnet/dialog.c new file mode 100644 index 0000000..ae37ae2 --- /dev/null +++ b/dlls/dpnet/dialog.c @@ -0,0 +1,113 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" +#include "wine/debug.h" +#include "winerror.h" +#include "winnt.h" +#include "winuser.h" + +#include "dplay8.h" +#include "dpaddr.h" +#include "dplay8_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + +WCHAR *pHostNameUserInput = NULL; +HANDLE hHostNameUserInputMutex; +HINSTANCE hinstDpnet; + +HRESULT DPNET_HostNameDialogInit(HINSTANCE hinstDLL) +{ + pHostNameUserInput = NULL; + hinstDpnet = hinstDLL; + hHostNameUserInputMutex = CreateMutexA(NULL, FALSE, "DPNET HostNameUserInputMutex"); + return TRUE; +} + +HRESULT DPNET_HostNameDialogUninit() +{ + CloseHandle(hHostNameUserInputMutex); + return TRUE; +} + +BOOL WINAPI DPNET_HostNameDlgProc(HWND hwnd, UINT msg, WPARAM wParam, + LPARAM lParam) +{ + switch (msg) + { + case WM_COMMAND: + switch LOWORD(wParam) + { + case IDOK: + { + int textlen; + textlen = GetWindowTextLengthW(GetDlgItem(hwnd, 701)) + 1; + pHostNameUserInput = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * textlen); + GetWindowTextW(GetDlgItem(hwnd, 701), pHostNameUserInput, + textlen); + EndDialog(hwnd, wParam); + return TRUE; + } + case IDCANCEL: + EndDialog(hwnd, wParam); + return TRUE; + } + } + return FALSE; +} + +/* FIXME: maybe we should return a DirectPlay8Address ? */ +HRESULT DPNET_HostNameShowDialog(PWCHAR *ppUserInput) +{ + int hostnamebytelen; + HINSTANCE hinstDpnet2 = LoadLibraryA("DPNET"); + + TRACE("(%p)\n", ppUserInput); + + WaitForSingleObject(hHostNameUserInputMutex, INFINITE); + DialogBoxA(hinstDpnet2, "HOSTNAME", 0, DPNET_HostNameDlgProc); + + if (!pHostNameUserInput && !lstrlenW(pHostNameUserInput)) + { + TRACE("returning fail\n"); + return E_FAIL; + } + hostnamebytelen = (lstrlenW(pHostNameUserInput)+1) * sizeof(WCHAR); + *ppUserInput = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, hostnamebytelen); + memcpy(*ppUserInput, pHostNameUserInput, hostnamebytelen); + HeapFree(GetProcessHeap(), 0, pHostNameUserInput); + + ReleaseMutex(hHostNameUserInputMutex); + return S_OK; +} + +HRESULT DPNET_HostNameFree(PWCHAR pUserInput) +{ + HeapFree(GetProcessHeap(), 0, pUserInput); + return S_OK; +} + diff --git a/dlls/dpnet/dplay8_private.h b/dlls/dpnet/dplay8_private.h new file mode 100644 index 0000000..d6b3785 --- /dev/null +++ b/dlls/dpnet/dplay8_private.h @@ -0,0 +1,453 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_DPLAY8_PRIVATE_H +#define __WINE_DPLAY8_PRIVATE_H + +#include "dplay8.h" +#include "dplobby8.h" +#include "dplay8sp.h" + +#include "winsock2.h" + +#define ICOM_THIS(impl,iface) impl* const This=(impl*)(iface) +#define ICOM_VTABLE(iface) iface##Vtbl +#define ICOM_VFIELD(iface) ICOM_VTABLE(iface)* lpVtbl +#define ICOM_VTBL(iface) (iface)->lpVtbl +#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) + + +typedef struct IDirectPlay8ClientImpl IDirectPlay8ClientImpl; +typedef struct IDirectPlay8PeerImpl IDirectPlay8PeerImpl; +typedef struct IDirectPlay8ServerImpl IDirectPlay8ServerImpl; +typedef struct IDirectPlay8LobbiedApplicationImpl IDirectPlay8LobbiedApplicationImpl; +typedef struct IDirectPlay8LobbyClientImpl IDirectPlay8LobbyClientImpl; +typedef struct IDirectPlay8AddressImpl IDirectPlay8AddressImpl; + +typedef struct IDirectPlay8ThreadPoolImpl IDirectPlay8ThreadPoolImpl; +typedef struct IDirectPlay8SP_TCPImpl IDirectPlay8SP_TCPImpl; +typedef struct IDirectPlay8SP_TCPIPImpl IDirectPlay8SP_TCPIPImpl; + +typedef struct tpJobQueueNode tpJobQueueNode; +typedef struct dpOutMessageToAddr dpOutMessageToAddr; + +typedef struct DPNET_AsyncOp DPNET_AsyncOp; + +/* FIXME: add some "pre-send", "retry", "timeout", "complete", + * etc, callbacks to this structure. Also we'll need a way + * to handle multiple destinations. */ + +struct DPNET_AsyncOp { + DPNET_AsyncOp *prev, *next; + DWORD dwType, dwFlags, dwID; + PVOID pvUserContext; + HANDLE hSyncEvent; + BOOL forget; + + IDirectPlay8Address *pAddrHost; + IDirectPlay8Address *pAddrDev; + DWORD dwRetryLimit, dwRetryInterval, dwTimeOut; + DWORD dwTimeSent; + DWORD cUserBuffer; + DPN_BUFFER_DESC PackBuffer; + DPN_BUFFER_DESC UserBuffer[8]; +}; + +typedef struct dpPlayer dpPlayer; + +typedef enum { + PLAYER_UNKNOWN, + PLAYER_REQUEST_SENT, + PLAYER_RESPONSE_SENT, + PLAYER_CONNECTED, + PLAYER_ACCEPTED, + PLAYER_REJECTED, + PLAYER_ACTIVE, +} PlayerStatus; + +struct dpPlayer +{ + dpPlayer *prev; /* only for remote players */ + dpPlayer *next; /* ditto */ + + BOOL set; + PlayerStatus status; + PVOID pvPlayerContext; + + DPNID dwPlayerID; + IDirectPlay8Address *pAddress; + DWORD conn_id; + DWORD ver; + DWORD dplay_ver; + + LPWSTR name; + PVOID data; + DWORD data_len; + + BYTE next_in, next_out, ack_in, ack_out; + + /* hopefully one critical section per player is OK */ + CRITICAL_SECTION cs; + + PVOID conn_data; + DWORD conn_data_len; + PVOID conn_data_ctx; + + PVOID reply_data; + DWORD reply_data_len; +}; + +struct DirectPlay8GlobalData +{ + PFNDPNMESSAGEHANDLER pfMessageHandler; + PVOID pvUserContext; + + dpOutMessageToAddr *msgToAddrTail; + DPN_CAPS dpnCaps; + + /* current service provider list */ + DPN_SERVICE_PROVIDER_INFO *pSPAvailable; + DWORD SPAvailableCount; + + /* selected service provider */ + GUID guidSP; + IDirectPlay8ServiceProvider *sp; + + BYTE dwPacketCount; + + dpPlayer localPlayer; + dpPlayer *remotePlayers; + dpPlayer *remoteHost; + CRITICAL_SECTION cs_player; + + DPN_APPLICATION_DESC appdesc; + + BOOL is_host; + LONG pkt_id; + LONG player_id; + + CRITICAL_SECTION cs_aop; + DPNET_AsyncOp *aop_head; + DPNET_AsyncOp *aop_tail; +}; + +struct IDirectPlay8ClientImpl +{ + /* IUnknown fields */ + const IDirectPlay8ClientVtbl *lpVtbl; + DWORD ref; + /* IDirectPlay8Client fields */ + void *dummy; +}; + +struct IDirectPlay8PeerImpl +{ + /* IUnknown fields */ + const IDirectPlay8PeerVtbl *lpVtbl; + DWORD ref; + /* IDirectPlay8Peer fields */ + BOOL connected; + IDirectPlay8Address *pHostAddr; + DirectPlay8GlobalData dp8gdData; +}; + +struct IDirectPlay8ServerImpl +{ + /* IUnknown fields */ + const IDirectPlay8ServerVtbl *lpVtbl; + DWORD ref; + /* IDirectPlay8Server fields */ + void *dummy; +}; + +struct IDirectPlay8LobbiedApplicationImpl +{ + /* IUnknown fields */ + const IDirectPlay8LobbiedApplicationVtbl *lpVtbl; + DWORD ref; + /* IDirectPlay8LobbiedApplicationImpl fields */ + void *dummy; +}; + +struct IDirectPlay8LobbyClientImpl +{ + /* IUnknown fields */ + const IDirectPlay8LobbyClientVtbl *lpVtbl; + DWORD ref; + /* IDirectPlay8LobbyClientImpl fields */ + void *dummy; +}; + +struct AddressComponent +{ + WCHAR *pwszName; + void *lpvData; + DWORD dwDataSize; + DWORD dwDataType; + struct AddressComponent *next; +}; + +/* a bit hacky. should be in some interface */ +typedef void (*spReleaseAddressInfo)(PVOID); +/* shouldn't need to duplicate !!!! SHOULD USE URL. HACK */ +typedef void (*spDuplicateAddressInfo)(IDirectPlay8Address *, PVOID); + +struct IDirectPlay8AddressImpl +{ + /* IUnknown fields */ + const IDirectPlay8AddressVtbl *lpVtbl; + const IDirectPlay8AddressIPVtbl *lpVtbl2; + DWORD ref; + /* IDriectPlay8Address / IDirectPlay8AddressIP fields */ + GUID guidSP; + GUID guidDevice; + + struct AddressComponent *component; + void *pvUserData; + DWORD dwDataSize; + + HANDLE hDialogMutex; /* HACK: if we are sending to this address and the + * service provider wants to show a dialogbox, it needs to + * lock this - ensures that we don't show multiple dialog boxs + * at once etc. + * This can go once sending is windowed and in a single thread. + */ + spReleaseAddressInfo spDataRelease; + spDuplicateAddressInfo spDataDuplicate; + void *spData; +}; + +typedef struct tpReadNode tpReadNode; + +typedef BOOL (*tpInitFunc)(void *, tpReadNode *); +typedef BOOL (*tpReadFunc)(void *, tpReadNode *); + +struct tpReadNode { + tpReadNode *prev; + tpReadNode *next; + + LPVOID ctx; + tpInitFunc pfnInit; + tpReadFunc pfnRead; + OVERLAPPED ovl; + DPN_BUFFER_DESC Addr; + DPN_BUFFER_DESC Data; + IDirectPlay8Address *pAddr; +}; + +typedef struct tpWriteNode tpWriteNode; + +typedef BOOL (*tpWriteFunc)(void *, tpWriteNode *); +typedef BOOL (*tpTimeFunc)(void *, tpWriteNode *); + +struct tpWriteNode { + tpWriteNode *prev; + tpWriteNode *next; + + LPVOID ctx; + tpWriteFunc pfnWrite; + tpTimeFunc pfnTime; + DPNET_AsyncOp *aop; +}; + +typedef struct tpThreadNode tpThreadNode; + +struct tpThreadNode { + tpThreadNode *prev; + tpThreadNode *next; + + HANDLE hThread, hJob; + DWORD dwID; + + CRITICAL_SECTION cs; + BOOL die_please; + tpReadNode *Read; +}; + +struct IDirectPlay8ThreadPoolImpl +{ + /* IUnknown fields */ + const IDirectPlay8ThreadPoolVtbl *lpVtbl; + DWORD ref; + + /* IDirectPlay8ThreadPool fields */ + PVOID pvUserContext; + PFNDPNMESSAGEHANDLER pfn; + DWORD dwNumThreads, dwCurThreads; + CRITICAL_SECTION cs_thread; + tpThreadNode *threads; + + HANDLE hTimer; + LARGE_INTEGER liDueTime; + CRITICAL_SECTION cs_timer; +}; + +struct IDirectPlay8SP_TCPIPImpl +{ + /* IUnknown fields */ + const IDirectPlay8ServiceProviderVtbl *lpVtbl; + DWORD ref; + /* IDirectPlay8SPWinsockTCPIP fields */ + SOCKET socket; + DWORD dwMaxSize; + IDirectPlay8ThreadPool *threadPool; + DirectPlay8GlobalData *dp8gdData; + spMessageReceived msgCallback; + DPN_SP_CAPS dpnSPCaps; +}; + +/* client.c */ +HRESULT DPNET_CreateDirectPlay8Client(IUnknown *pOuter, REFIID riid, LPVOID *ppobj); + +/* peer.c */ +HRESULT DPNET_CreateDirectPlay8Peer(IUnknown *pOuter, REFIID riid, LPVOID *ppobj); + +/* server.c */ +HRESULT DPNET_CreateDirectPlay8Server(IUnknown *pOuter, REFIID riid, LPVOID *ppobj); + +/* lobbiedapp.c */ +HRESULT DPNET_CreateDirectPlay8LobbiedApplication(IUnknown *pOuter, REFIID riid, LPVOID *ppobj); + +/* lobbyclient.c */ +HRESULT DPNET_CreateDirectPlay8LobbyClient(IUnknown *pOuter, REFIID riid, LPVOID *ppobj); + +/* address.c */ +HRESULT DPNET_CreateDirectPlay8Address(IUnknown *pOuter, REFIID riid, LPVOID *ppobj); +HRESULT DPNET_Address_SetSPData(PDIRECTPLAY8ADDRESS iface, void *data, + spReleaseAddressInfo spReleaseCallback, + spDuplicateAddressInfo spDuplicateCallback); +HRESULT DPNET_Address_GetSPData(PDIRECTPLAY8ADDRESS iface, void **data); +HRESULT DPNET_Address_GetDialogLock(PDIRECTPLAY8ADDRESS iface); +HRESULT DPNET_Address_ReleaseDialogLock(PDIRECTPLAY8ADDRESS iface); + +HRESULT DPNET_GetKeyValueW(const WCHAR *url, const WCHAR *keyName, + WCHAR *keyValue /* [OUT] */, + PDWORD bufferLen /* [IN OUT] */); + +/* sp_tcpip.c */ +HRESULT DPNET_CreateDirectPlay8SP_TCPIP(IUnknown *pOuter, REFIID riid, LPVOID *ppobj); + +/* threadpool.c */ +HRESULT DPNET_CreateDirectPlay8ThreadPool(IUnknown *pOuter, REFIID riid, LPVOID *ppobj); +HRESULT DPNET_GetThreadPool(IDirectPlay8ThreadPool **ppThreadPool, DWORD dwNumThreads); +void DPNET_InitAsyncRead(IDirectPlay8ThreadPool *pThreadPool, tpInitFunc pfnInit, tpReadFunc pfnRead, void *data); + +/* general.c */ +WCHAR *DPNET_strndupW(WCHAR *pwszSource, int len); +WCHAR *DPNET_strdupW(WCHAR *pwszSource); +DPNET_AsyncOp* DPNET_AsyncAlloc(DirectPlay8GlobalData *dp8gdData, DWORD dwType, DWORD dwSize); +HRESULT DPNET_AsyncFree(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop); +void DPNET_AsyncSetSync(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop); +void DPNET_AsyncSignal(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop); +void DPNET_AsyncWait(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop); +void DPNET_AsyncInsert(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop); +void DPNET_AsyncRemove(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop); +DPNET_AsyncOp* DPNET_AsyncSearch(DirectPlay8GlobalData *dp8gdData, DWORD dwType, DWORD dwID); +HRESULT DPNET_ObjInit(DirectPlay8GlobalData *dp8gdData, PVOID const pvUserContext, + const PFNDPNMESSAGEHANDLER pfn, const DWORD dwFlags); +void DPNET_ObjFree(DirectPlay8GlobalData *dp8gdData); +DWORD DPNET_Random(DirectPlay8GlobalData *dp8gdData); +HRESULT DPNET_EnumServiceProviders(DirectPlay8GlobalData *dp8gdData, + const GUID *const pguidServiceProvider, + const GUID *const pguidApplication, + DPN_SERVICE_PROVIDER_INFO *pSPInfoBuffer, + DWORD *pcbEnumData, + DWORD *pcReturned, + DWORD dwFlags); + +/* session.c */ +void DPNET_KillPlayers(DirectPlay8GlobalData *dp8gdData); +HRESULT DPNET_GetCaps(DirectPlay8GlobalData *dp8gdData, + DPN_CAPS *const pdpCaps, + const DWORD dwFlags); +HRESULT DPNET_GetSPCaps(DirectPlay8GlobalData *dp8gdData, + const GUID *const pguidSP, + DPN_SP_CAPS *const pdpnSPCaps, + const DWORD dwFlags); +HRESULT DPNET_CancelAsyncOperation(DirectPlay8GlobalData *dp8gdData, + const DPNHANDLE hAsyncHandle, + const DWORD dwFlags); +HRESULT DPNET_ReturnBuffer(DirectPlay8GlobalData *dp8gdData, + const DPNHANDLE hBufferHandle, + const DWORD dwFlags); +HRESULT DPNET_GetApplicationDesc(DirectPlay8GlobalData *dp8gdData, + DPN_APPLICATION_DESC *const pAppDescBuffer, + DWORD *const pcbDataSize, + const DWORD dwFlags); +HRESULT DPNET_SetPeerInfo(DirectPlay8GlobalData *dp8gdData, + const DPN_PLAYER_INFO *const pdpnPlayerInfo, + PVOID const pvAsyncContext, DPNHANDLE *const phAsyncHandle, + const DWORD dwFlags); +HRESULT DPNET_GetPeerInfo(DirectPlay8GlobalData *dp8gdData, + const DPNID dpnid, + DPN_PLAYER_INFO *const pdpnPlayerInfo, + DWORD *const pdwSize, + const DWORD dwFlags); +HRESULT DPNET_GetPlayerContext(DirectPlay8GlobalData *dp8gdData, + const DPNID dpnid, + PVOID *const ppvPlayerContext, + const DWORD dwFlags); +HRESULT DPNET_EnumHosts(DirectPlay8GlobalData *dp8gdData, + PDPN_APPLICATION_DESC const pApplicationDesc, + IDirectPlay8Address *const pAddrHost, IDirectPlay8Address *const pDeviceInfo, + PVOID const pUserEnumData, const DWORD dwUserEnumDataSize, + const DWORD dwEnumCount, const DWORD dwRetryInterval, + const DWORD dwTimeOut, PVOID const pvUserContext, DPNHANDLE *const pAsyncHandle, + const DWORD dwFlags); +HRESULT DPNET_Connect(DirectPlay8GlobalData *dp8gdData, + const DPN_APPLICATION_DESC *const pdnAppDesc, + IDirectPlay8Address *pAddrHost, + IDirectPlay8Address *pDeviceInfo, + const DPN_SECURITY_DESC * const pdnSecurity, + const DPN_SECURITY_CREDENTIALS *const pdnCredentials, + const void *const pvUserConnectData, + DWORD dwUserConnectDataSize, + void *pvPlayerContext, void *pvAsyncContext, + DPNHANDLE *phAsyncHandle, DWORD dwFlags); +HRESULT DPNET_Host(DirectPlay8GlobalData *dp8gdData, + const DPN_APPLICATION_DESC *const pdnAppDesc, + IDirectPlay8Address **const prgpDeviceInfo, + const DWORD cDeviceInfo, + const DPN_SECURITY_DESC *const pdnSecurity, + const DPN_SECURITY_CREDENTIALS *const pdnCredentials, + void *pvPlayerContext, + const DWORD dwFlags); +HRESULT DPNET_SendTo(DirectPlay8GlobalData *dp8gdData, const DPNID dpnid, + const DPN_BUFFER_DESC *const pBufferDesc, const DWORD cBufferDesc, + const DWORD dwTimeOut, void *pvAsyncContext, + DPNHANDLE *const phAsyncHandle, const DWORD dwFlags); + +/* dialog.c */ +HRESULT DPNET_HostNameDialogInit(HINSTANCE hinstDLL); +HRESULT DPNET_HostNameDialogUninit(); +HRESULT DPNET_HostNameShowDialog(PWCHAR *ppUserInput); +HRESULT DPNET_HostNameFree(PWCHAR pUserInput); + + +/* debug.c */ +void debug_hexdump(void *data, unsigned long len); + +/* parse.c */ +void DPNET_StartParse(void); +void DPNET_StopParse(void); +void DPNET_ParsePacket(int proto, struct sockaddr_in *from, struct sockaddr_in *to, + const DPN_BUFFER_DESC *buf, const DWORD bufs); + +#endif diff --git a/dlls/dpnet/dplay8sp.h b/dlls/dpnet/dplay8sp.h new file mode 100644 index 0000000..f4c1c4c --- /dev/null +++ b/dlls/dpnet/dplay8sp.h @@ -0,0 +1,107 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* This is the header file for the service providers + * PLEASE NOTE: The dp8 service provider API is NOT available from Microsoft + * and they are not willing to give it to anyone. So this interface has been + * created by David Hammerton (TransGaming Technologies). So feel + * free to change it if you want. + * It is very much a work in progress! + */ + +#ifndef _WINE_DPLAY8SP_H__ +#define _WINE_DPLAY8SP_H__ + +#include "ole2.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#include "dplay8.h" + +/* IID for DirectPlay8 Service Providers */ +/* {985E2C76-66BC-4d66-AD8E-ED3801F1B459} */ +DEFINE_GUID(IID_IDirectPlay8ServiceProvider, +0x985e2c76, 0x66bc, 0x4d66, 0xad, 0x8e, 0xed, 0x38, 0x1, 0xf1, 0xb4, 0x59); + +/* interface pointers */ +typedef struct IDirectPlay8ServiceProvider *PDIRECTPLAY8SERVICEPROVIDER; + +/* external types */ +typedef struct DirectPlay8GlobalData DirectPlay8GlobalData; + +/* callback functions */ +typedef BOOL (*spMessageReceived)(DirectPlay8GlobalData *, void *, int, IDirectPlay8Address *); + +/* non structure/message datatypes */ + +/* message identifiers */ + +/* constants */ + +/* Flags */ + +/* non message structures */ + +/* message callback structures */ + +/* functions */ + +/******** Interfaces *******/ + +/* IDirectPlay8ServiceProvider */ +#define INTERFACE IDirectPlay8ServiceProvider +DECLARE_INTERFACE_(IDirectPlay8ServiceProvider,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IDirectPlay8ServiceProvider methods ***/ + STDMETHOD_(HRESULT,Initialize)(THIS_ DirectPlay8GlobalData * dp8gdData, spMessageReceived msgCallback, DWORD dwFlags) PURE; + STDMETHOD_(HRESULT,SendTo)(THIS_ IDirectPlay8Address * pAddrDest, const DPN_BUFFER_DESC * prgBufferDesc, const DWORD cBufferDesc, DWORD dwFlags) PURE; + STDMETHOD_(HRESULT,SetSPCaps)(THIS_ DPN_SP_CAPS * pdpspCaps, DWORD dwFlags) PURE; + STDMETHOD_(HRESULT,GetSPCaps)(THIS_ DPN_SP_CAPS * pdpspCaps, DWORD dwFlags) PURE; + STDMETHOD_(HRESULT,SetSPAddressData)(THIS_ IDirectPlay8Address * pAddr) PURE; + STDMETHOD_(HRESULT,BuildAddressFromSPData)(THIS_ IDirectPlay8Address * pAddr, PVOID pvSPData) PURE; + STDMETHOD_(HRESULT,ReturnBuffer)(THIS_ void * pk, DWORD dwFlags) PURE; +}; +#undef INTERFACE + + /* IUnknown methods */ +#define IDirectPlay8ServiceProvider_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectPlay8ServiceProvider_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectPlay8ServiceProvider_Release(p) (p)->lpVtbl->Release(p) + /* IDirectPlay8ServiceProvider methods */ +#define IDirectPlay8ServiceProvider_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c) +#define IDirectPlay8ServiceProvider_SendTo(p,a,b,c,d) (p)->lpVtbl->SendTo(p,a,b,c,d) +#define IDirectPlay8ServiceProvider_SetSPCaps(p,a,b) (p)->lpVtbl->SetSPCaps(p,a,b) +#define IDirectPlay8ServiceProvider_GetSPCaps(p,a,b) (p)->lpVtbl->GetSPCaps(p,a,b) +#define IDirectPlay8ServiceProvider_SetSPAddressData(p,a) (p)->lpVtbl->SetSPAddressData(p,a) +#define IDirectPlay8ServiceProvider_BuildAddressFromSPData(p,a,b) (p)->lpVtbl->BuildAddressFromSPData(p,a,b) +#define IDirectPlay8ServiceProvider_ReturnBuffer(p,a,b) (p)->lpVtbl->ReturnBuffer(p,a,b) + + +#ifdef __cplusplus +} +#endif + +#endif /* _WINE_DPLAY8SP_H__ */ diff --git a/dlls/dpnet/dpnet_classfactory.c b/dlls/dpnet/dpnet_classfactory.c new file mode 100644 index 0000000..be09b93 --- /dev/null +++ b/dlls/dpnet/dpnet_classfactory.c @@ -0,0 +1,174 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" +#include "wine/debug.h" +#include "winerror.h" + +#include "dplay8.h" +#include "dplobby8.h" +#include "dplay8_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + +typedef struct +{ + /* IUnknown fields */ + const IClassFactoryVtbl *lpVtbl; + DWORD ref; + HRESULT (*pfnCreateInstance)(IUnknown *pOuter, REFIID riid, + LPVOID *ppobj); +} IClassFactoryImpl; + +static HRESULT WINAPI +DPCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) +{ + /*ICOM_THIS(IClassFactoryImpl, iface);*/ + + FIXME("(%p)->(%s, %p): stub\n", iface, debugstr_guid(riid), ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI DPCF_AddRef(LPCLASSFACTORY iface) +{ + ICOM_THIS(IClassFactoryImpl,iface); + return ++(This->ref); +} + +static ULONG WINAPI DPCF_Release(LPCLASSFACTORY iface) +{ + ICOM_THIS(IClassFactoryImpl,iface); + /* static class, won't be freed */ + return --(This->ref); +} + +static HRESULT WINAPI +DPCF_CreateInstance(LPCLASSFACTORY iface, + LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) +{ + ICOM_THIS(IClassFactoryImpl,iface); + + TRACE("(%p)->(%p,%s,%p)\n",iface,pOuter,debugstr_guid(riid),ppobj); + return This->pfnCreateInstance(pOuter, riid, ppobj); +} + +static HRESULT WINAPI DPCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) +{ + /*ICOM_THIS(IClassFactoryImpl,iface);*/ + FIXME("(%p)->(%d),stub!\n",iface,dolock); + return S_OK; +} + +static const IClassFactoryVtbl DPCF_Vtbl = +{ + DPCF_QueryInterface, + DPCF_AddRef, + DPCF_Release, + DPCF_CreateInstance, + DPCF_LockServer +}; + +static IClassFactoryImpl DPNET_CF_Client = {&DPCF_Vtbl, 1, DPNET_CreateDirectPlay8Client }; +static IClassFactoryImpl DPNET_CF_Server = {&DPCF_Vtbl, 1, DPNET_CreateDirectPlay8Server }; +static IClassFactoryImpl DPNET_CF_Peer = {&DPCF_Vtbl, 1, DPNET_CreateDirectPlay8Peer }; + +static IClassFactoryImpl DPNET_CF_LobbiedApplication = {&DPCF_Vtbl, 1, DPNET_CreateDirectPlay8LobbiedApplication }; +static IClassFactoryImpl DPNET_CF_LobbyClient = {&DPCF_Vtbl, 1, DPNET_CreateDirectPlay8LobbyClient }; + +static IClassFactoryImpl DPNET_CF_Address = {&DPCF_Vtbl, 1, DPNET_CreateDirectPlay8Address }; + +static IClassFactoryImpl DPNET_CF_ThreadPool = {&DPCF_Vtbl, 1, DPNET_CreateDirectPlay8ThreadPool }; + +static IClassFactoryImpl DPNET_CF_SP_TCPIP = {&DPCF_Vtbl, 1, DPNET_CreateDirectPlay8SP_TCPIP }; + +/*********************************************************************** + * DllGetClassObject (DPNET.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, + LPVOID *ppv) +{ + TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if (!IsEqualGUID(riid, &IID_IClassFactory) && + !IsEqualGUID(riid, &IID_IUnknown)) + { + ERR("(%s, %s, %p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; + } + + if (IsEqualGUID(rclsid, &CLSID_DirectPlay8Client)) + { + DPCF_AddRef((IClassFactory*)&DPNET_CF_Client); + *ppv = &DPNET_CF_Client; + return S_OK; + } + else if (IsEqualGUID(rclsid, &CLSID_DirectPlay8Server)) + { + DPCF_AddRef((IClassFactory*)&DPNET_CF_Server); + *ppv = &DPNET_CF_Server; + return S_OK; + } + else if (IsEqualGUID(rclsid, &CLSID_DirectPlay8Peer)) + { + DPCF_AddRef((IClassFactory*)&DPNET_CF_Peer); + *ppv = &DPNET_CF_Peer; + return S_OK; + } + else if (IsEqualGUID(rclsid, &CLSID_DirectPlay8LobbiedApplication)) + { + DPCF_AddRef((IClassFactory*)&DPNET_CF_LobbiedApplication); + *ppv = &DPNET_CF_LobbiedApplication; + return S_OK; + } + else if (IsEqualGUID(rclsid, &CLSID_DirectPlay8LobbyClient)) + { + DPCF_AddRef((IClassFactory*)&DPNET_CF_LobbyClient); + *ppv = &DPNET_CF_LobbyClient; + return S_OK; + } + else if (IsEqualGUID(rclsid, &CLSID_DirectPlay8Address)) + { + DPCF_AddRef((IClassFactory*)&DPNET_CF_Address); + *ppv = &DPNET_CF_Address; + return S_OK; + } + else if (IsEqualGUID(rclsid, &CLSID_DirectPlay8ThreadPool)) + { + DPCF_AddRef((IClassFactory*)&DPNET_CF_ThreadPool); + *ppv = &DPNET_CF_ThreadPool; + return S_OK; + } + else if (IsEqualGUID(rclsid, &CLSID_DP8SP_TCPIP)) + { + DPCF_AddRef((IClassFactory*)&DPNET_CF_SP_TCPIP); + *ppv = &DPNET_CF_SP_TCPIP; + return S_OK; + } + ERR("(%s, %s, %p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 44788d4..d8e692a 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -1,7 +1,7 @@ -/* - * DirectPlay - * - * Copyright 2004 Raphael Junqueira +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,139 +16,86 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * */ -#include "config.h" #include <stdarg.h> +#include <string.h> + #include "windef.h" #include "winbase.h" -#include "wingdi.h" #include "winuser.h" -#include "objbase.h" +#include "winreg.h" #include "wine/debug.h" +#include "winerror.h" #include "dplay8.h" -/* - *#include "dplobby8.h" - *#include "dplay8sp.h" - */ -#include "dpnet_private.h" +#include "dplay8_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); -WINE_DEFAULT_DEBUG_CHANNEL(dpnet); +/*********************************************************************** + * DllMain [Internal] + */ -/* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hInstDLL, fdwReason, lpvReserved); - if (fdwReason == DLL_PROCESS_ATTACH) { - DisableThreadLibraryCalls(hInstDLL); - } - return TRUE; + TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DPNET_HostNameDialogInit(hinstDLL); + DPNET_StartParse(); + break; + case DLL_THREAD_ATTACH: + break; + case DLL_THREAD_DETACH: + break; + case DLL_PROCESS_DETACH: + DPNET_StopParse(); + DPNET_HostNameDialogUninit(); + break; + } + + return TRUE; } /*********************************************************************** * DirectPlay8Create (DPNET.@) + * Old and unused thesedays. */ -HRESULT WINAPI DirectPlay8Create(REFGUID lpGUID, LPVOID *ppvInt, LPUNKNOWN punkOuter) +HRESULT WINAPI DirectPlay8Create(CONST CLSID* pcIID, LPVOID* ppvInterface, IUnknown* pUnknown) { - TRACE("(%s, %p, %p): stub\n", debugstr_guid(lpGUID), ppvInt, punkOuter); + TRACE("(%s, %p, %p): stub\n", debugstr_guid(pcIID), ppvInterface, pUnknown); return S_OK; } -/******************************************************************************* - * DirectPlay ClassFactory +/*********************************************************************** + * DllCanUnloadNow (DPNET.@) */ -typedef struct +HRESULT WINAPI DllCanUnloadNow(void) { - /* IUnknown fields */ - const IClassFactoryVtbl *lpVtbl; - LONG ref; - REFCLSID rclsid; - HRESULT (*pfnCreateInstanceFactory)(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); -} IClassFactoryImpl; - -static HRESULT WINAPI DICF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - - FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI DICF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - return InterlockedIncrement(&This->ref); -} - -static ULONG WINAPI DICF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - /* static class, won't be freed */ - return InterlockedDecrement(&This->ref); -} - -static HRESULT WINAPI DICF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - - TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); - return This->pfnCreateInstanceFactory(iface, pOuter, riid, ppobj); -} - -static HRESULT WINAPI DICF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - FIXME("(%p)->(%d),stub!\n",This,dolock); - return S_OK; + FIXME("(void): stub\n"); + return S_OK; } -static const IClassFactoryVtbl DICF_Vtbl = { - DICF_QueryInterface, - DICF_AddRef, - DICF_Release, - DICF_CreateInstance, - DICF_LockServer -}; - -static IClassFactoryImpl DPNET_CFS[] = { - { &DICF_Vtbl, 1, &CLSID_DirectPlay8Client, DPNET_CreateDirectPlay8Client }, - { &DICF_Vtbl, 1, &CLSID_DirectPlay8Server, DPNET_CreateDirectPlay8Server }, - { &DICF_Vtbl, 1, &CLSID_DirectPlay8Peer, DPNET_CreateDirectPlay8Peer }, - { &DICF_Vtbl, 1, &CLSID_DirectPlay8Address, DPNET_CreateDirectPlay8Address }, - { NULL, 0, NULL, NULL } -}; - /*********************************************************************** - * DllCanUnloadNow (DPNET.@) + * DllRegisterServer (DPNET.@) */ -HRESULT WINAPI DllCanUnloadNow(void) +HRESULT WINAPI DllRegisterServer(void) { - return S_FALSE; + FIXME("(void): stub\n"); + return S_OK; } /*********************************************************************** - * DllGetClassObject (DPNET.@) + * DllUnregisterServer (DPNET.@) */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllUnregisterServer(void) { - int i = 0; - - TRACE("(%p,%p,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - /* - if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) { - *ppv = (LPVOID)&DPNET_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } - */ - while (NULL != DPNET_CFS[i].rclsid) { - if (IsEqualGUID(rclsid, DPNET_CFS[i].rclsid)) { - DICF_AddRef((IClassFactory*) &DPNET_CFS[i]); - *ppv = &DPNET_CFS[i]; - return S_OK; - } - ++i; - } - - FIXME("(%p,%p,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - return CLASS_E_CLASSNOTAVAILABLE; + FIXME("(void): stub\n"); + return S_OK; } + diff --git a/dlls/dpnet/general.c b/dlls/dpnet/general.c new file mode 100644 index 0000000..7983b62 --- /dev/null +++ b/dlls/dpnet/general.c @@ -0,0 +1,291 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" +#include "wine/debug.h" +#include "winerror.h" +#include "winnt.h" +#include "winreg.h" +#include "winnls.h" +#include "wine/unicode.h" + +#include "dplay8.h" +#include "dplay8_private.h" + +#define WINE_UNICODE_REWRITE + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + +/* File that holds miscilanous functions used by all main DirectPlay8 classee */ + +WCHAR *DPNET_strndupW(WCHAR *pwszSource, int len) +{ + WCHAR *pwszNewString; + + if (!pwszSource) return NULL; + if (strlenW(pwszSource) < len) + len = strlenW(pwszSource); + pwszNewString = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len + 1) * sizeof(WCHAR)); + memcpy(pwszNewString, pwszSource, len * sizeof(WCHAR)); + pwszNewString[len] = '\0'; + return pwszNewString; +} + +WCHAR *DPNET_strdupW(WCHAR *pwszSource) +{ + return DPNET_strndupW(pwszSource, strlenW(pwszSource)); +} + +DPNET_AsyncOp* DPNET_AsyncAlloc(DirectPlay8GlobalData *dp8gdData, DWORD dwType, DWORD dwSize) +{ + DPNET_AsyncOp* aop = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DPNET_AsyncOp) + dwSize); + aop->dwType = dwType; + aop->PackBuffer.dwBufferSize = dwSize; + aop->PackBuffer.pBufferData = (LPVOID)(aop+1); + return aop; +} + +HRESULT DPNET_AsyncFree(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop) +{ +/* HRESULT ret = aop->result; */ + HRESULT ret = S_OK; + + /* sanity check */ + if (aop->prev || aop->next || + dp8gdData->aop_head == aop || + dp8gdData->aop_tail == aop) { + FIXME("aop not unlinked before free!! expect crash!!\n"); + } + + if (aop->pAddrHost) IDirectPlay8Address_Release(aop->pAddrHost); + if (aop->pAddrDev) IDirectPlay8Address_Release(aop->pAddrDev); + if (aop->hSyncEvent) CloseHandle(aop->hSyncEvent); + HeapFree(GetProcessHeap(), 0, aop); + return ret; +} + +void DPNET_AsyncSetSync(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop) +{ + aop->hSyncEvent = CreateEventA(NULL, TRUE, FALSE, NULL); +} + +void DPNET_AsyncSignal(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop) +{ + if (aop->hSyncEvent) { + SetEvent(aop->hSyncEvent); + } else { + DPNET_AsyncFree(dp8gdData, aop); + } +} + +void DPNET_AsyncWait(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop) +{ + /* if thread pool has no threads, we should call DoWork or something */ + WaitForSingleObject(aop->hSyncEvent, INFINITE); +} + +void DPNET_AsyncInsert(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop) +{ + EnterCriticalSection(&dp8gdData->cs_aop); + aop->prev = dp8gdData->aop_tail; + aop->next = NULL; + dp8gdData->aop_tail = aop; + if (!aop->prev) dp8gdData->aop_head = aop; + LeaveCriticalSection(&dp8gdData->cs_aop); +} + +void DPNET_AsyncRemove(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop) +{ + EnterCriticalSection(&dp8gdData->cs_aop); + if (aop->prev) aop->prev->next = aop->next; + else dp8gdData->aop_head = aop->next; + aop->prev = NULL; + if (aop->next) aop->next->prev = aop->prev; + else dp8gdData->aop_tail = aop->prev; + aop->next = NULL; + LeaveCriticalSection(&dp8gdData->cs_aop); +} + +DPNET_AsyncOp* DPNET_AsyncSearch(DirectPlay8GlobalData *dp8gdData, DWORD dwType, DWORD dwID) +{ + DPNET_AsyncOp *aop; + EnterCriticalSection(&dp8gdData->cs_aop); + aop = dp8gdData->aop_head; + while (aop) { + if (aop->dwType == dwType && aop->dwID == dwID) + break; + aop = aop->next; + } + LeaveCriticalSection(&dp8gdData->cs_aop); + return aop; +} + +HRESULT DPNET_ObjInit(DirectPlay8GlobalData *dp8gdData, PVOID const pvUserContext, + const PFNDPNMESSAGEHANDLER pfn, const DWORD dwFlags) +{ + dp8gdData->pfMessageHandler = pfn; + dp8gdData->pvUserContext = pvUserContext; + dp8gdData->dpnCaps.dwSize = sizeof(DPN_CAPS); + dp8gdData->dpnCaps.dwFlags = 0; + dp8gdData->dpnCaps.dwConnectTimeout = 2000; + dp8gdData->dpnCaps.dwConnectRetries = 14; + dp8gdData->dpnCaps.dwTimeoutUntilKeepAlive = 60000; + InitializeCriticalSection(&dp8gdData->cs_aop); + InitializeCriticalSection(&dp8gdData->cs_player); + InitializeCriticalSection(&dp8gdData->localPlayer.cs); + dp8gdData->localPlayer.dplay_ver = 7; + return S_OK; +} + +void DPNET_ObjFree(DirectPlay8GlobalData *dp8gdData) +{ + int i; + DPNET_AsyncOp *aop; + + TRACE("%p\n", dp8gdData); + + DPNET_KillPlayers(dp8gdData); + + for (i = 0; i < dp8gdData->SPAvailableCount; i++) + { + HeapFree(GetProcessHeap(), 0, dp8gdData->pSPAvailable[i].pwszName); + } + HeapFree(GetProcessHeap(), 0, dp8gdData->pSPAvailable); + dp8gdData->SPAvailableCount = 0; + if (dp8gdData->sp) + { + IDirectPlay8ServiceProvider_Release(dp8gdData->sp); + } + + DeleteCriticalSection(&dp8gdData->localPlayer.cs); + DeleteCriticalSection(&dp8gdData->cs_player); + + EnterCriticalSection(&dp8gdData->cs_aop); + aop = dp8gdData->aop_head; + while (aop) { + DPNET_AsyncOp *next_aop = aop->next; + DPNET_AsyncFree(dp8gdData, aop); + aop = next_aop; + } + LeaveCriticalSection(&dp8gdData->cs_aop); + DeleteCriticalSection(&dp8gdData->cs_aop); + + HeapFree(GetProcessHeap(), 0, dp8gdData); +} + +DWORD DPNET_Random(DirectPlay8GlobalData *dp8gdData) +{ + /* this is probably random enough for our purposes. */ + return GetTickCount() * 524287; +} + +HRESULT DPNET_EnumServiceProviders(DirectPlay8GlobalData *dp8gdData, + const GUID *const pguidServiceProvider, + const GUID *const pguidApplication, + DPN_SERVICE_PROVIDER_INFO * pSPInfoBuffer, + DWORD * pcbEnumData, + DWORD * pcReturned, + const DWORD dwFlags) +{ + TRACE("(%s, %s, %p, %p (%i), %p, 0x%08x)\n", + debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + pSPInfoBuffer, pcbEnumData, *pcbEnumData, pcReturned, dwFlags); + + if (pguidServiceProvider) + { + FIXME("ignoring pguidServiceProvider\n"); + } + if (pguidApplication) + { + FIXME("ignoring pguidApplication\n"); + } + if (dwFlags && dwFlags & ~DPNENUMSERVICEPROVIDERS_ALL) + { + FIXME("unrecognised flags\n"); + } + + if (!dp8gdData->pSPAvailable) /* must fill our structure of available service providers */ + { + HKEY kDPSPRoot; + DWORD subKeys, maxSubKeyLen; + LPSTR lpSubKeyBuffer; + int i; + + RegOpenKeyA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\DirectPlay8\\Service Providers", &kDPSPRoot); + RegQueryInfoKeyA(kDPSPRoot, NULL, NULL, NULL, &subKeys, &maxSubKeyLen, + NULL, NULL, NULL, NULL, NULL, NULL); + dp8gdData->pSPAvailable = HeapAlloc(GetProcessHeap(), 0, sizeof(DPN_SERVICE_PROVIDER_INFO) * subKeys); + dp8gdData->SPAvailableCount = subKeys; + lpSubKeyBuffer = HeapAlloc(GetProcessHeap(), 0, maxSubKeyLen + 1); + for (i = 0; i < subKeys; i++) + { + HKEY kDPSP; + DWORD RegValueSize; + LPSTR lpRegValue; + LPWSTR lpRegValueW; + int WCharNameSize; + + RegEnumKeyA(kDPSPRoot, i, lpSubKeyBuffer, maxSubKeyLen + 1); + RegOpenKeyA(kDPSPRoot, lpSubKeyBuffer, &kDPSP); + + dp8gdData->pSPAvailable[i].dwFlags = 0; + + RegQueryValueExA(kDPSP, "Friendly Name", 0, NULL, NULL, &RegValueSize); + lpRegValue = HeapAlloc(GetProcessHeap(), 0, RegValueSize); + RegQueryValueExA(kDPSP, "Friendly Name", 0, NULL, (LPBYTE)lpRegValue, &RegValueSize); + WCharNameSize = RegValueSize * sizeof(WCHAR) / sizeof(CHAR); + dp8gdData->pSPAvailable[i].pwszName = HeapAlloc(GetProcessHeap(), 0, WCharNameSize); + MultiByteToWideChar(CP_ACP, 0, lpRegValue, -1, dp8gdData->pSPAvailable[i].pwszName, + WCharNameSize); + HeapFree(GetProcessHeap(), 0, lpRegValue); + + RegQueryValueExA(kDPSP, "GUID", 0, NULL, NULL, &RegValueSize); + lpRegValue = HeapAlloc(GetProcessHeap(), 0, RegValueSize); + lpRegValueW = HeapAlloc(GetProcessHeap(), 0, RegValueSize * sizeof(WCHAR) / sizeof(CHAR)); + RegQueryValueExA(kDPSP, "GUID", 0, NULL, (LPBYTE)lpRegValue, &RegValueSize); + MultiByteToWideChar(CP_ACP, 0, lpRegValue, -1, lpRegValueW, + RegValueSize * sizeof(WCHAR) / sizeof(CHAR)); + CLSIDFromString(lpRegValueW, &dp8gdData->pSPAvailable[i].guid); + HeapFree(GetProcessHeap(), 0, lpRegValue); + HeapFree(GetProcessHeap(), 0, lpRegValueW); + + dp8gdData->pSPAvailable[i].pvReserved = 0; + dp8gdData->pSPAvailable[i].dwReserved = 0; + } + HeapFree(GetProcessHeap(), 0, lpSubKeyBuffer); + } + if (*pcbEnumData < sizeof(DPN_SERVICE_PROVIDER_INFO) * dp8gdData->SPAvailableCount) + { + *pcbEnumData = sizeof(DPN_SERVICE_PROVIDER_INFO) * dp8gdData->SPAvailableCount; + *pcReturned = 0; + return DPNERR_BUFFERTOOSMALL; + } + /* FIXME: shouldn't use memcpy :( */ + memcpy(pSPInfoBuffer, dp8gdData->pSPAvailable, sizeof(DPN_SERVICE_PROVIDER_INFO) * dp8gdData->SPAvailableCount); + *pcReturned = dp8gdData->SPAvailableCount; + return S_OK; +} diff --git a/dlls/dpnet/hostname_En.rc b/dlls/dpnet/hostname_En.rc new file mode 100755 index 0000000..7e5fab0 --- /dev/null +++ b/dlls/dpnet/hostname_En.rc @@ -0,0 +1,39 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +HOSTNAME DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 192, 68 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "Enter host name" +FONT 8, "Helv" +{ + DEFPUSHBUTTON "OK", IDOK, 135, 7, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 135, 24, 50, 14 + LTEXT "Enter the remote machine address:", -1, 7, 7, 114, 11 + EDITTEXT 701, 7, 48, 178, 13, ES_AUTOHSCROLL +} + +#include "version.rc" + diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c new file mode 100644 index 0000000..1ae6f1f --- /dev/null +++ b/dlls/dpnet/lobbiedapp.c @@ -0,0 +1,132 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" +#include "wine/debug.h" +#include "winerror.h" + +#include "dplay8.h" +#include "dplobby8.h" +#include "dplay8_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + +static ICOM_VTABLE(IDirectPlay8LobbiedApplication) directPlay8LobbiedApplicationVT; + +HRESULT WINAPI +DirectPlay8LobbiedApplication_QueryInterface(PDIRECTPLAY8LOBBIEDAPPLICATION iface, + REFIID riid, LPVOID *obj) +{ + ICOM_THIS(IDirectPlay8LobbiedApplicationImpl, iface); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IDirectPlay8LobbiedApplication, riid)) + { + This->ref++; + *obj = This; + return S_OK; + } + else + { + FIXME("(%p)->(%s, %p): no interface\n", iface, debugstr_guid(riid), obj); + return E_NOINTERFACE; + } +} + +ULONG WINAPI +DirectPlay8LobbiedApplication_AddRef(PDIRECTPLAY8LOBBIEDAPPLICATION iface) +{ + ICOM_THIS(IDirectPlay8LobbiedApplicationImpl, iface); + TRACE("(%p)->()\n", iface); + return ++This->ref; +} + +ULONG WINAPI +DirectPlay8LobbiedApplication_Release(PDIRECTPLAY8LOBBIEDAPPLICATION iface) +{ + ICOM_THIS(IDirectPlay8LobbiedApplicationImpl, iface); + TRACE("(%p)->()\n", iface); + if (--This->ref) return This->ref; + + FIXME("destroy this and everything\n"); + + HeapFree(GetProcessHeap(), 0, This); + return 0; +} + +HRESULT WINAPI +DirectPlay8LobbiedApplication_Initialize(PDIRECTPLAY8LOBBIEDAPPLICATION iface, + const PVOID pvUserContext, + const PFNDPNMESSAGEHANDLER pfn, + DPNHANDLE * const pdpnhConnection, + const DWORD dwFlags) +{ + /*ICOM_THIS(IDirectPlay8LobbiedApplicationImpl, iface);*/ + FIXME("(%p)->(%p, %p, %p, 0x%08x): stub. Lobbying not supported, you _may_ be able to ignore this\n", + iface, pvUserContext, + pfn, pdpnhConnection, dwFlags); + *pdpnhConnection = (DPNHANDLE)NULL; + return S_OK; +} + +HRESULT +DPNET_CreateDirectPlay8LobbiedApplication(IUnknown *pOuter, REFIID riid, LPVOID *ppobj) +{ + IDirectPlay8LobbiedApplicationImpl *ipDP8LA; + HRESULT hr; + TRACE("()\n"); + ipDP8LA = (IDirectPlay8LobbiedApplicationImpl *) + HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(IDirectPlay8LobbiedApplicationImpl)); + if (ipDP8LA == NULL) return E_OUTOFMEMORY; + ICOM_VTBL(ipDP8LA) = &directPlay8LobbiedApplicationVT; + IDirectPlay8LobbiedApplication_AddRef((IDirectPlay8LobbiedApplication *)ipDP8LA); + TRACE("Created new interface: %p\n", ipDP8LA); + hr = IDirectPlay8LobbiedApplication_QueryInterface((IDirectPlay8LobbiedApplication *)ipDP8LA, riid, ppobj); + IDirectPlay8LobbiedApplication_Release((IDirectPlay8LobbiedApplication *)ipDP8LA); + if (SUCCEEDED(hr)) + return S_OK; + else + return E_NOINTERFACE; +} + +static ICOM_VTABLE(IDirectPlay8LobbiedApplication) directPlay8LobbiedApplicationVT = +{ + DirectPlay8LobbiedApplication_QueryInterface, + DirectPlay8LobbiedApplication_AddRef, + DirectPlay8LobbiedApplication_Release, + DirectPlay8LobbiedApplication_Initialize, + (void*)0xdead5005, /* RegisterProgram */ + (void*)0xdead5006, /* UnRegisterProgram */ + (void*)0xdead5007, /* Send */ + (void*)0xdead5008, /* SetAppAvailable */ + (void*)0xdead5009, /* UpdateStatus */ + (void*)0xdead500a, /* Close */ + (void*)0xdead500b, /* GetConnectionSettings */ + (void*)0xdead500c /* SetConnectionSettings */ +}; + diff --git a/dlls/dpnet/lobbyclient.c b/dlls/dpnet/lobbyclient.c new file mode 100644 index 0000000..7fe6eec --- /dev/null +++ b/dlls/dpnet/lobbyclient.c @@ -0,0 +1,116 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" +#include "wine/debug.h" +#include "winerror.h" + +#include "dplay8.h" +#include "dplobby8.h" +#include "dplay8_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + +static ICOM_VTABLE(IDirectPlay8LobbyClient) directPlay8LobbyClientVT; + +HRESULT WINAPI +DirectPlay8LobbyClient_QueryInterface(PDIRECTPLAY8LOBBYCLIENT iface, + REFIID riid, LPVOID *obj) +{ + ICOM_THIS(IDirectPlay8LobbyClientImpl, iface); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IDirectPlay8LobbyClient, riid)) + { + This->ref++; + *obj = This; + return S_OK; + } + else + { + FIXME("(%p)->(%s, %p): no interface\n", iface, debugstr_guid(riid), obj); + return E_NOINTERFACE; + } +} + +ULONG WINAPI +DirectPlay8LobbyClient_AddRef(PDIRECTPLAY8LOBBYCLIENT iface) +{ + ICOM_THIS(IDirectPlay8LobbyClientImpl, iface); + TRACE("(%p)->()\n", iface); + return ++This->ref; +} + +ULONG WINAPI +DirectPlay8LobbyClient_Release(PDIRECTPLAY8LOBBYCLIENT iface) +{ + ICOM_THIS(IDirectPlay8LobbyClientImpl, iface); + TRACE("(%p)->()\n", iface); + if (--This->ref) return This->ref; + + FIXME("destroy this and everything\n"); + + HeapFree(GetProcessHeap(), 0, This); + return 0; +} + +HRESULT +DPNET_CreateDirectPlay8LobbyClient(IUnknown *pOuter, REFIID riid, LPVOID *ppobj) +{ + IDirectPlay8LobbyClientImpl *ipDP8LC; + HRESULT hr; + TRACE("()\n"); + ipDP8LC = (IDirectPlay8LobbyClientImpl *) + HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(IDirectPlay8LobbyClientImpl)); + if (ipDP8LC == NULL) return E_OUTOFMEMORY; + ICOM_VTBL(ipDP8LC) = &directPlay8LobbyClientVT; + IDirectPlay8LobbyClient_AddRef((IDirectPlay8LobbyClient *)ipDP8LC); + TRACE("Created new interface: %p\n", ipDP8LC); + hr = IDirectPlay8LobbyClient_QueryInterface((IDirectPlay8LobbyClient *)ipDP8LC, riid, ppobj); + IDirectPlay8LobbyClient_Release((IDirectPlay8LobbyClient *)ipDP8LC); + if (SUCCEEDED(hr)) + return S_OK; + else + return E_NOINTERFACE; +} + +static ICOM_VTABLE(IDirectPlay8LobbyClient) directPlay8LobbyClientVT = +{ + DirectPlay8LobbyClient_QueryInterface, + DirectPlay8LobbyClient_AddRef, + DirectPlay8LobbyClient_Release, + (void*)0xdead6004, /* Initialize */ + (void*)0xdead6005, /* EnumLocalPrograms */ + (void*)0xdead6006, /* ConnectApplication */ + (void*)0xdead6007, /* Send */ + (void*)0xdead6008, /* ReleaseApplication */ + (void*)0xdead6009, /* Close */ + (void*)0xdead600a, /* GetConnectionSettings */ + (void*)0xdead600b /* SetConnectionSettings */ +}; + diff --git a/dlls/dpnet/parse.c b/dlls/dpnet/parse.c new file mode 100644 index 0000000..48d7dca --- /dev/null +++ b/dlls/dpnet/parse.c @@ -0,0 +1,152 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <stdarg.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" +#include "wine/debug.h" +#include "winerror.h" +#include "winnt.h" +#include "winreg.h" +#include "winnls.h" +#include "wine/unicode.h" + +#include "nmapi.h" +#include "dplay8.h" +#include "dplay8_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + +HMODULE hParse, hNM; +PPF_PARSERDLLINFO info; + +static HPROTOCOL WINAPI (*pCreateProtocol)(LPCSTR ProtocolName, LPENTRYPOINTS lpEntryPoints, DWORD cbEntryPoints); +static HPROTOCOL WINAPI (*pGetProtocolFromName)(LPCSTR ProtocolName); +static void WINAPI (*pParsePacket)(HPROTOCOL pprot, HPROTOCOL prot, LPVOID pkt, DWORD size, DWORD hsize); + +LPVOID dllinfo; +HPROTOCOL udp, dpsp; +CRITICAL_SECTION parse_cs; + +void DPNET_GetParseInfo(void) +{ + /* this is not necessary, I think */ +#if 0 + PARSERAUTOINSTALLINFO install_info; + + install_info = (LPVOID)GetProcAddress(hParse, "ParserAutoInstallInfo"); + info = install_info(); + TRACE("got parser info: %p\n", info); +#endif +} + +void DPNET_StartParse(void) +{ + TRACE("loading dp8parse.dll\n"); + hParse = LoadLibraryA("dp8parse.dll"); + if (!hParse) { + TRACE("- dp8parse.dll not found, protocol parsing unavailable\n"); + return; + } + hNM = LoadLibraryA("nmapi.dll"); + if (!hNM) { + FreeLibrary(hParse); + hParse = 0; + TRACE("- nmapi.dll not found, protocol parsing unavailable\n"); + return; + } + pParsePacket = (LPVOID)GetProcAddress(hNM, "wine_ParsePacket"); + if (!pParsePacket) { + FreeLibrary(hNM); + hNM = 0; + FreeLibrary(hParse); + hParse = 0; + TRACE("- not using builtin nmapi.dll, protocol parsing unavailable\n"); + return; + } + pCreateProtocol = (LPVOID)GetProcAddress(hNM, "CreateProtocol"); + pGetProtocolFromName = (LPVOID)GetProcAddress(hNM, "GetProtocolFromName"); + InitializeCriticalSection(&parse_cs); + + DPNET_GetParseInfo(); + + udp = pCreateProtocol("UDP", NULL, 0); + + dpsp = pGetProtocolFromName("DPLAYSP"); +} + +void DPNET_StopParse(void) +{ + if (!hParse) return; + DeleteCriticalSection(&parse_cs); + TRACE("unloading dp8parse.dll\n"); + FreeLibrary(hNM); + hNM = 0; + FreeLibrary(hParse); + hParse = 0; +} + +typedef struct { + WORD sport; + WORD dport; + WORD len; + WORD cksum; +} UDP; + +void DPNET_ParsePacket(int proto, struct sockaddr_in *from, struct sockaddr_in *to, + const DPN_BUFFER_DESC *buf, const DWORD bufs) +{ + UDP *hdr; + LPBYTE ptr; + DWORD c, len; + + if (!hParse) return; + + len = 0; + for (c=0; c<bufs; c++) + len += buf[c].dwBufferSize; + + hdr = HeapAlloc(GetProcessHeap(), 0, sizeof(UDP) + len); + hdr->sport = from ? from->sin_port : htons(2302); + hdr->dport = to ? to->sin_port : htons(2302); + hdr->len = htons(sizeof(UDP) + len); + hdr->cksum = 0; /* not important */ + ptr = (LPBYTE)(hdr+1); + for (c=0; c<bufs; c++) { + memcpy(ptr, buf[c].pBufferData, buf[c].dwBufferSize); + ptr += buf[c].dwBufferSize; + } + + /* serializing the parsing makes for cleaner traces. */ + EnterCriticalSection(&parse_cs); + + TRACE("from port %d to port %d, payload %d bytes\n", ntohs(hdr->sport), ntohs(hdr->dport), len); + + pParsePacket(udp, dpsp, hdr, sizeof(UDP) + len, sizeof(UDP)); + + LeaveCriticalSection(&parse_cs); + + HeapFree(GetProcessHeap(), 0, hdr); +} diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index cb4b638..3d95c39 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -1,7 +1,7 @@ -/* - * DirectPlay8 Peer - * - * Copyright 2004 Raphael Junqueira +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,26 +16,401 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * */ -#include "config.h" - #include <stdarg.h> - +#include <string.h> #include "windef.h" #include "winbase.h" -#include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "objbase.h" #include "wine/debug.h" +#include "winerror.h" +#include "winnt.h" #include "dplay8.h" -#include "dpnet_private.h" +#include "dplay8_private.h" + +#define WINE_UNICODE_REWRITE + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + +static ICOM_VTABLE(IDirectPlay8Peer) directPlay8PeerVT; + +HRESULT WINAPI DirectPlay8Peer_QueryInterface(PDIRECTPLAY8PEER iface, + REFIID riid, LPVOID *obj) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IDirectPlay8Peer, riid)) + { + This->ref++; + *obj = This; + return S_OK; + } + else + { + FIXME("(%p)->(%s, %p): no interface\n", iface, debugstr_guid(riid), obj); + return E_NOINTERFACE; + } +} + +ULONG WINAPI DirectPlay8Peer_AddRef(PDIRECTPLAY8PEER iface) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->()\n", iface); + return ++This->ref; +} + +ULONG WINAPI DirectPlay8Peer_Release(PDIRECTPLAY8PEER iface) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->()\n", iface); + if (--This->ref) return This->ref; + + DPNET_ObjFree(&This->dp8gdData); + + HeapFree(GetProcessHeap(), 0, This); + return 0; +} + +HRESULT WINAPI DirectPlay8Peer_Initialize(PDIRECTPLAY8PEER iface, PVOID const pvUserContext, + const PFNDPNMESSAGEHANDLER pfn, const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->(%p, %p, 0x%08x)\n", iface, pvUserContext, pfn, dwFlags); + return DPNET_ObjInit(&This->dp8gdData, pvUserContext, pfn, dwFlags); +} + +HRESULT WINAPI DirectPlay8Peer_EnumServiceProviders(PDIRECTPLAY8PEER iface, + const GUID *const pguidServiceProvider, + const GUID *const pguidApplication, + DPN_SERVICE_PROVIDER_INFO *const pSPInfoBuffer, + DWORD *const pcbEnumData, DWORD *const pcReturned, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->(%s, %s, %p, %p (%i), %p, 0x%08x)\n", + iface, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + pSPInfoBuffer, pcbEnumData, *pcbEnumData, pcReturned, dwFlags); + return DPNET_EnumServiceProviders(&This->dp8gdData, pguidServiceProvider, pguidApplication, + pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); +} + +HRESULT WINAPI DirectPlay8Peer_GetPeerAddress(PDIRECTPLAY8PEER iface, + const DPNID dpnid, + IDirectPlay8Address **const pAddress, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + dpPlayer *cur; + + TRACE("(%p)->(%i, %p, %08x)\n", iface, dpnid, pAddress, dwFlags); + + cur = This->dp8gdData.remotePlayers; + + while (cur) + { + if (cur->dwPlayerID == dpnid) + { + *pAddress = cur->pAddress; + IDirectPlay8Address_AddRef(*pAddress); + return S_OK; + } + cur = cur->next; + } + + /* we don't check local player, this is correct. local player isn't checked */ + return DPNERR_INVALIDPLAYER; +} + + +HRESULT WINAPI DirectPlay8Peer_GetLocalHostAddresses(PDIRECTPLAY8PEER iface, + IDirectPlay8Address **const prgpAddress, + DWORD *const pcAddress, + const DWORD dwFlags) +{ + /*ICOM_THIS(IDirectPlay8PeerImpl, iface);*/ + FIXME("(%p)->(%p, %p, 0x%08x): semi-stub\n", iface, prgpAddress, pcAddress, dwFlags); + + return DPNERR_NOTHOST; +} + +HRESULT WINAPI DirectPlay8Peer_Close(PDIRECTPLAY8PEER iface, const DWORD dwFlags) +{ + FIXME("(%p)->(0x%08x)\n", iface, dwFlags); + return S_OK; +} + +HRESULT WINAPI DirectPlay8Peer_EnumHosts(PDIRECTPLAY8PEER iface, PDPN_APPLICATION_DESC const pApplicationDesc, + IDirectPlay8Address *const pAddrHost, IDirectPlay8Address *const pDeviceInfo, + PVOID const pUserEnumData, const DWORD dwUserEnumDataSize, + const DWORD dwEnumCount, const DWORD dwRetryInterval, + const DWORD dwTimeOut, PVOID const pvUserContext, DPNHANDLE *const pAsyncHandle, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->(%p, %p, %p, %p, %i, %i, %i, %i, %p, %p, 0x%08x)\n", iface, pApplicationDesc, pAddrHost, + pDeviceInfo, pUserEnumData, dwUserEnumDataSize, dwEnumCount, dwRetryInterval, dwTimeOut, + pvUserContext, pAsyncHandle, dwFlags); + return DPNET_EnumHosts(&This->dp8gdData, pApplicationDesc, pAddrHost, + pDeviceInfo, pUserEnumData, dwUserEnumDataSize, dwEnumCount, + dwRetryInterval, dwTimeOut, pvUserContext, pAsyncHandle, dwFlags); +} + +HRESULT WINAPI DirectPlay8Peer_CancelAsyncOperation(PDIRECTPLAY8PEER iface, const DPNHANDLE hAsyncHandle, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->(0x%08x, 0x%08x)\n", iface, hAsyncHandle, dwFlags); + return DPNET_CancelAsyncOperation(&This->dp8gdData, hAsyncHandle, dwFlags); +} + +HRESULT WINAPI DirectPlay8Peer_Connect(PDIRECTPLAY8PEER iface, + const DPN_APPLICATION_DESC *const pdnAppDesc, + IDirectPlay8Address *const pHostAddr, + IDirectPlay8Address *const pDeviceInfo, + const DPN_SECURITY_DESC *const pdnSecurity, + const DPN_SECURITY_CREDENTIALS *const pdnCredentials, + const void *const pvUserConnectData, + const DWORD dwUserConnectDataSize, + void *const pvPlayerContext, void *const pvAsyncContext, + DPNHANDLE *const phAsyncHandle, const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + + TRACE("(%p)->(%p, %p, %p, %p, %p, %p, %i, %p, %p, %p, 0x%08x)\n", iface, pdnAppDesc, + pHostAddr, pDeviceInfo, pdnSecurity, pdnCredentials, pvUserConnectData, + dwUserConnectDataSize, pvPlayerContext, pvAsyncContext, phAsyncHandle, dwFlags); + if (pdnSecurity || pdnCredentials) + FIXME("we do not yet support securtity stuff.. Either does dplay8 or 9\n"); + memcpy(&This->dp8gdData.appdesc.guidApplication, &pdnAppDesc->guidApplication, sizeof(GUID)); + memcpy(&This->dp8gdData.appdesc.guidInstance, &pdnAppDesc->guidInstance, sizeof(GUID)); -WINE_DEFAULT_DEBUG_CHANNEL(dpnet); + return DPNET_Connect(&This->dp8gdData, pdnAppDesc, pHostAddr, pDeviceInfo, + pdnSecurity, pdnCredentials, pvUserConnectData, + dwUserConnectDataSize, pvPlayerContext, pvAsyncContext, + phAsyncHandle, dwFlags); +} + +HRESULT WINAPI DirectPlay8Peer_SendTo(PDIRECTPLAY8PEER iface, const DPNID dpnid, + const DPN_BUFFER_DESC *const pBufferDesc, const DWORD cBufferDesc, + const DWORD dwTimeOut, void *const pvAsyncContext, + DPNHANDLE *const phAsyncHandle, const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->(%i, %p, %i, %i, %p, %p, 0x%08x)\n", iface, dpnid, pBufferDesc, cBufferDesc, + dwTimeOut, pvAsyncContext, phAsyncHandle, dwFlags); + return DPNET_SendTo(&This->dp8gdData, dpnid, pBufferDesc, cBufferDesc, + dwTimeOut, pvAsyncContext, phAsyncHandle, dwFlags); +} + +HRESULT WINAPI DirectPlay8Peer_Host(PDIRECTPLAY8PEER iface, + const DPN_APPLICATION_DESC *const pdnAppDesc, + IDirectPlay8Address **const prgpDeviceInfo, + const DWORD cDeviceInfo, + const DPN_SECURITY_DESC *const pdpSecurity, + const DPN_SECURITY_CREDENTIALS *const pdpCredentials, + VOID *const pvPlayerContext, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + + TRACE("(%p)->(%p, %p, %i, %p, %p, %p, 0x%08x)\n", iface, pdnAppDesc, + prgpDeviceInfo, cDeviceInfo, pdpSecurity, pdpCredentials, pvPlayerContext, + dwFlags); + if (pdpSecurity || pdpCredentials) + FIXME("we do not yet support securtity stuff.. Either does dplay8 or 9\n"); -HRESULT DPNET_CreateDirectPlay8Peer(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { - WARN("(%p, %s, %p): stub.\n", punkOuter, debugstr_guid(riid), ppobj); - return CLASS_E_CLASSNOTAVAILABLE; + memcpy(&This->dp8gdData.appdesc.guidApplication, &pdnAppDesc->guidApplication, sizeof(GUID)); + CoCreateGuid(&This->dp8gdData.appdesc.guidInstance); + + return DPNET_Host(&This->dp8gdData, pdnAppDesc, prgpDeviceInfo, cDeviceInfo, + pdpSecurity, pdpCredentials, pvPlayerContext, dwFlags); +} + +HRESULT WINAPI DirectPlay8Peer_GetApplicationDesc(PDIRECTPLAY8PEER iface, + DPN_APPLICATION_DESC *const pAppDescBuffer, + DWORD *const pcbDataSize, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->(%p, %p (%i), 0x%08x)\n", iface, pAppDescBuffer, + pcbDataSize, *pcbDataSize, dwFlags); + return DPNET_GetApplicationDesc(&This->dp8gdData, pAppDescBuffer, pcbDataSize, dwFlags); } + + +HRESULT WINAPI DirectPlay8Peer_EnumPlayersAndGroups(PDIRECTPLAY8PEER iface, + DPNID *const prgdpnid, + DWORD *const pcdpnid, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + int count; + dpPlayer *cur; + + TRACE("(%p)->(%p, %p (%08i), %08x)\n", iface, prgdpnid, pcdpnid, *pcdpnid, dwFlags); + + if (!(dwFlags & DPNENUM_PLAYERS)) + { + FIXME("only support enumeration of players\n"); + return DPNERR_INVALIDFLAGS; + } + + count = 1; /* local */ + + cur = This->dp8gdData.remotePlayers; + while (cur) + { + count++; + cur = cur->next; + } + + if (*pcdpnid < count) + { + *pcdpnid = count; + return DPNERR_BUFFERTOOSMALL; + } + + count = 0; + prgdpnid[count++] = This->dp8gdData.localPlayer.dwPlayerID; + cur = This->dp8gdData.remotePlayers; + while (cur) + { + prgdpnid[count] = cur->dwPlayerID; + count++; + cur = cur->next; + } + + return S_OK; +} + +HRESULT WINAPI DirectPlay8Peer_SetPeerInfo(PDIRECTPLAY8PEER iface, + const DPN_PLAYER_INFO *const pdpnPlayerInfo, + PVOID const pvAsyncContext, DPNHANDLE *const phAsyncHandle, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->(%p, %p, %p, 0x%08x)\n", iface, pdpnPlayerInfo, + pvAsyncContext, phAsyncHandle, dwFlags); + return DPNET_SetPeerInfo(&This->dp8gdData, pdpnPlayerInfo, pvAsyncContext, phAsyncHandle, dwFlags); +} + +HRESULT WINAPI DirectPlay8Peer_GetPeerInfo(PDIRECTPLAY8PEER iface, const DPNID dpnid, + DPN_PLAYER_INFO *const pdpnPlayerInfo, + DWORD *const pdwSize, const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->(%x, %p, %p (%i), 0x%08x)\n", iface, dpnid, + pdpnPlayerInfo, pdwSize, *pdwSize, dwFlags); + return DPNET_GetPeerInfo(&This->dp8gdData, dpnid, pdpnPlayerInfo, pdwSize, dwFlags); +} + +HRESULT WINAPI DirectPlay8Peer_ReturnBuffer(PDIRECTPLAY8PEER iface, const DPNHANDLE hBufferHandle, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->(%i, 0x%08x)\n", iface, hBufferHandle, dwFlags); + return DPNET_ReturnBuffer(&This->dp8gdData, hBufferHandle, dwFlags); +} + +HRESULT WINAPI DirectPlay8Peer_GetPlayerContext(PDIRECTPLAY8PEER iface, const DPNID dpnid, + PVOID *const ppvPlayerContext, const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->(%i, %p, 0x%08x)\n", iface, dpnid, ppvPlayerContext, dwFlags); + return DPNET_GetPlayerContext(&This->dp8gdData, dpnid, ppvPlayerContext, dwFlags); +} + +HRESULT WINAPI DirectPlay8Peer_GetCaps(PDIRECTPLAY8PEER iface, DPN_CAPS *const pdpCaps, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->(%p, 0x%08x)\n", iface, pdpCaps, dwFlags); + return DPNET_GetCaps(&This->dp8gdData, pdpCaps, dwFlags); +} + +HRESULT WINAPI DirectPlay8Peer_GetSPCaps(PDIRECTPLAY8PEER iface, const GUID *const pguidSP, + DPN_SP_CAPS *const pdpnSPCaps, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8PeerImpl, iface); + TRACE("(%p)->(%s, %p, 0x%08x)\n", iface, debugstr_guid(pguidSP), + pdpnSPCaps, dwFlags); + return DPNET_GetSPCaps(&This->dp8gdData, pguidSP, pdpnSPCaps, dwFlags); +} + +HRESULT WINAPI DirectPlay8Peer_TerminateSession(PDIRECTPLAY8PEER iface, + void *const pvTerminateData, + const DWORD dwTerminateDataSize, + const DWORD dwFlags) +{ + /*ICOM_THIS(IDirectPlay8PeerImpl, iface);*/ + FIXME("(%p): stub\n", iface); + return S_OK; +} + + +HRESULT DPNET_CreateDirectPlay8Peer(IUnknown *pOuter, REFIID riid, LPVOID *ppobj) +{ + IDirectPlay8PeerImpl *ipDP8P; + HRESULT hr; + TRACE("()\n"); + ipDP8P = (IDirectPlay8PeerImpl *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(IDirectPlay8PeerImpl)); + if (ipDP8P == NULL) return E_OUTOFMEMORY; + ICOM_VTBL(ipDP8P) = &directPlay8PeerVT; + IDirectPlay8Peer_AddRef((IDirectPlay8Peer *)ipDP8P); + TRACE("Created new object: %p\n", ipDP8P); + hr = IDirectPlay8Peer_QueryInterface((IDirectPlay8Peer *)ipDP8P, riid, ppobj); + IDirectPlay8Peer_Release((IDirectPlay8Peer *)ipDP8P); + if (SUCCEEDED(hr)) + return S_OK; + else + return E_NOINTERFACE; +} + +static ICOM_VTABLE(IDirectPlay8Peer) directPlay8PeerVT = +{ + DirectPlay8Peer_QueryInterface, + DirectPlay8Peer_AddRef, + DirectPlay8Peer_Release, + DirectPlay8Peer_Initialize, + DirectPlay8Peer_EnumServiceProviders, + DirectPlay8Peer_CancelAsyncOperation, + DirectPlay8Peer_Connect, + DirectPlay8Peer_SendTo, + (void*)0xdead2009, /* GetSendQueueInfo */ + DirectPlay8Peer_Host, /* Host */ + DirectPlay8Peer_GetApplicationDesc, + (void*)0xdead200c, /* SetApplicationDesc */ + (void*)0xdead200d, /* CreateGroup */ + (void*)0xdead200e, /* DestroyGroup */ + (void*)0xdead200f, /* AddPlayerToGroup */ + (void*)0xdead2010, /* RemovePlayerFromGroup */ + (void*)0xdead2011, /* SetGroupInfo */ + (void*)0xdead2012, /* GetGroupInfo */ + DirectPlay8Peer_EnumPlayersAndGroups, + (void*)0xdead2014, /* EnumGroupMembers */ + DirectPlay8Peer_SetPeerInfo, + DirectPlay8Peer_GetPeerInfo, + DirectPlay8Peer_GetPeerAddress, + DirectPlay8Peer_GetLocalHostAddresses, + DirectPlay8Peer_Close, + DirectPlay8Peer_EnumHosts, + (void*)0xdead201b, /* DestroyPeer */ + DirectPlay8Peer_ReturnBuffer, + DirectPlay8Peer_GetPlayerContext, + (void*)0xdead201e, /* GetGroupContext */ + DirectPlay8Peer_GetCaps, + (void*)0xdead2020, /* SetCaps */ + (void*)0xdead2021, /* SetSPCaps */ + DirectPlay8Peer_GetSPCaps, + (void*)0xdead2023, /* GetConnectionInfo */ + (void*)0xdead2024, /* RegisterLobby */ + DirectPlay8Peer_TerminateSession +}; + diff --git a/dlls/dpnet/protocol.h b/dlls/dpnet/protocol.h new file mode 100644 index 0000000..c210e2f --- /dev/null +++ b/dlls/dpnet/protocol.h @@ -0,0 +1,289 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_PROTOCOL_H +#define __WINE_PROTOCOL_H + +#include "dplay8.h" +#include "dplobby8.h" + +#include "pshpack1.h" + +/* message type magic numbers */ + +#define DP8P_ENUMHOSTS 0x00 +#define DP8P_CONNECT 0x88 +#define DP8P_SETPEERINFO 0x7F +#define DP8P_MESSAGEDATA 0x37 +#define DP8P_MESSAGEDATA_UNKNOWN 0x3D +#define DP8P_MESSAGEDATA_GUARANTEED 0x3F +#define DP8P_ACK 0x80 + +/* ENUMHOSTS */ + +#define DP8P_ENUMHOSTS_SEND 0x02 +#define DP8P_ENUMHOSTS_RESPONSE 0x03 + +typedef struct dp8pmsg_EnumHostsSend +{ + BYTE protocol_magic; + BYTE enum_type; /* ENUMHOST_SEND. */ + BYTE packet_count; + BYTE unknown_03; /* 0x82 */ + BYTE unknown_04; /* 0x01 */ + GUID guidApp; +} dp8pmsg_EnumHostsSend; + +typedef struct dp8pmsg_EnumHostsResponse +{ + BYTE protocol_magic; + BYTE enum_type; /* ENUMHOST_RESPONSE. */ + BYTE packet_count; + BYTE unknown_03; /* 0x82 */ + BYTE unknown_04; /* 0x00 */ + BYTE unknown_05[7]; /* 0x00 */ + BYTE unknown_12; /* ed */ + BYTE unknown_13; /* 8f */ + BYTE unknown_14; /* f0 */ + BYTE unknown_15; /* b7 */ + DWORD unknown_16; /* 0x00 */ + DWORD max_players; + DWORD current_players; /* ?? unconfirmed */ + DWORD unknown_28; /* 0x58 */ + DWORD unknown_32; /* 0x12 */ + BYTE unknown_36[24]; /* 0x00 */ + GUID guidUnknown; + GUID guidApp; + WCHAR game_name[0]; /* null terminate wide string */ +} dp8pmsg_EnumHostsResponse; + +/* ACK */ +/* response to message data (3f): 80 06 01 00 04 [05] 00 00 76 13 D8 04 + * (3f): 80 06 01 00 02 [02] 00 00 8e a7 6c 00 ( same session as below ) ( at time = 1.751872 ) + * response to server connect (88): 80 02 01 00 02 [00] 01 00 d9 11 36 6b 81 a7 6c 00 (at time = 1.729208) + * pid - sometimes its +1, odd. hrm, just seen it as +2, gah. + * type. not really sure. (doesnt change from packet to packet) + * player id, to/from? + */ +typedef struct dp8pmsg_Ack +{ + BYTE protocol_magic; + BYTE reply_type; + BYTE unknown_03; /* 01 */ + BYTE unknown_04; /* 00 */ + BYTE unknown_05; /* player ID maybe? */ + BYTE orig_packet_count; /* packet count of the one we are replying to, kinda */ + BYTE unknown_07; + BYTE unknown_08; + BYTE data[0]; + /* so far always includes: + * DWORD time_recieved; (from GetTickCount()) at end + * has also included another DWORD in connect replies, this dword is the same + * as the one we send out in 'connect' packets */ +} dp8pmsg_Ack; + +/* CONNECT */ + +/* go 1: + connect : 88 01 00 00 02 00 01 00 41 44 fe 72 a3 c7 14 00 + sresponse : 88 02 00 00 05 00 01 00 41 44 fe 72 ea a9 10 00 + --- Server recieves DPN_MSGID_INIDCATE_CONNECT here (after response)... odd + cresponse : 80 02 01 00 02 00 01 00 41 44 fe 72 ab c7 14 00 (ack) + */ +/* go 2: + connect : 88 01 00 00 02 00 01 00 c1 61 74 00 79 b2 4c 00 + sresponse : 88 02 00 00 05 00 01 00 c1 61 74 00 9b 94 48 00 + cresponse : 80 02 01 00 02 00 01 00 c1 61 74 00 80 b2 4c 00 + */ + +typedef struct dp8pmsg_Connect +{ + BYTE protocol_magic; + BYTE connect_type; /* 01 = connect, 02 = reply && connect to non-host peers. */ + BYTE packet_count; /* if so, it resets at 0. */ + BYTE unknown_04; /* 0x00 */ + BYTE unknown_05; /* 0x02 */ + BYTE unknown_06; /* 0x00 */ + BYTE unknown_07; /* 0x01 */ + BYTE unknown_08; /* 0x00 */ + /* FIXME: this unknown below MIGHT MATTER.. if so, I need to find out why?? */ + DWORD unknown_09; /* ... */ /* probably a dword of something... */ + DWORD time_sent; /* from GetTickCount() */ +} dp8pmsg_Connect; + +/* SETPEERINFO */ + +/* + 7f 00 01 00 c1 00 ...... +00 00 04 00 00 00 02 00 00 00 50 00 00 00 10 00 ........ ..P..... +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ........ ........ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ........ ........ +00 00 b6 5d c1 46 26 50 f5 44 95 51 f4 bd af 3b ...].F&P .D.Q...; +11 c1 36 30 6a 87 d7 ff bc 46 92 09 b4 2f 61 7b ..60j... .F.../a{ +9b e7 4d 00 61 00 72 00 69 00 73 00 69 00 61 00 ..M.a.r. i.s.i.a. +00 00 .. + +*/ +/* + 7f 00 01 02 c2 00 ........ !....... +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ........ ........ +00 00 00 00 00 00 03 00 00 00 f8 01 00 00 12 00 ........ ........ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ........ ........ +00 00 00 00 00 00 00 00 00 00 d2 e9 04 2e c5 30 ........ .......0 +f2 42 b5 28 93 ea 11 b0 55 ab 36 30 6a 87 d7 ff .B.(.... U.60j... +bc 46 92 09 b4 2f 61 7b 9b e7|d6 e9 54 2e 05 00 .F.../a{ ....T... +00 00 00 00 00 00 03 00 00 00 00 00 00 00|d0 e9 ........ ........ +24 2e 00 00 00 00 02 01 00 00 02 00 00 00 00 00 $....... ........ -- host +00 00 06 00 00 00 ea 01 00 00 0e 00 00 00 00 00 ........ ........ +00 00 00 00 00 00 00 00 00 00 00 00 00 00|d1 e9 ........ ........ +34 2e 00 00 00 00 00 01 00 00 03 00 00 00 00 00 4....... ........ -- other player +00 00 06 00 00 00 d6 01 00 00 14 00 00 00 00 00 ........ ........ +00 00 00 00 00 00 74 01 00 00 62 00 00 00|d6 e9 ......t. ..b..... +54 2e 00 00 00 00 00 01 00 00 05 00 00 00 00 00 T....... ........ +00 00 02 00 00 00 5e 01 00 00 16 00 00 00 00 00 ......^. ........ -- us ? +00 00 00 00 00 00 fc 00 00 00 62 00 00 00|78 2d ........ ..b...x- +64 69 72 65 63 74 70 6c 61 79 3a 2f 70 72 6f 76 directpl ay:/prov +69 64 65 72 3d 25 37 42 45 42 46 45 37 42 41 30 ider=%7B EBFE7BA0 +2d 36 32 38 44 2d 31 31 44 32 2d 41 45 30 46 2d -628D-11 D2-AE0F- +30 30 36 30 39 37 42 30 31 34 31 31 25 37 44 3b 006097B0 1411%7D; -- 120 (78) is len of uri + name +68 6f 73 74 6e 61 6d 65 3d 31 39 32 2e 31 36 38 hostname =192.168 -- 98 (62) is len of uri +2e 30 2e 31 39 3b 70 6f 72 74 3d 32 33 30 32 00 .0.19;po rt=2302. +54 00 65 00 73 00 74 00 50 00 6c 00 61 00 79 00 T.e.s.t. P.l.a.y. -- 22 (16) is len of name +65 00 72 00 00 00 78 2d 64 69 72 65 63 74 70 6c e.r...x- directpl +61 79 3a 2f 70 72 6f 76 69 64 65 72 3d 25 37 42 ay:/prov ider=%7B +45 42 46 45 37 42 41 30 2d 36 32 38 44 2d 31 31 EBFE7BA0 -628D-11 +44 32 2d 41 45 30 46 2d 30 30 36 30 39 37 42 30 D2-AE0F- 006097B0 -- 118 (76) is len of uri + name +31 34 31 31 25 37 44 3b 68 6f 73 74 6e 61 6d 65 1411%7D; hostname -- 98 (62) is len of uri +3d 31 39 32 2e 31 36 38 2e 30 2e 32 37 3b 70 6f =192.168 .0.27;po +72 74 3d 32 33 30 33 00 43 00 6c 00 69 00 65 00 rt=2303. C.l.i.e. -- 20 (14) is len of name +6e 00 74 00 54 00 77 00 6f 00 00 00 43 00 6c 00 n.t.T.w. o...C.l. +69 00 65 00 6e 00 74 00 00 00 54 00 65 00 73 00 i.e.n.t. ..T.e.s. -- 14 ( e) is len of name +74 00 47 00 61 00 6d 00 65 00 00 00 t.G.a.m. e... -- 18 (12) is len of game name + +*/ +typedef struct dp8pmsg_SetPeerInfo_Local +{ + BYTE protocol_magic; + BYTE unknown_02; + BYTE packet_count; + BYTE unknown_04; /* 00 */ /* -- peer type ID? */ + DWORD unknown_05; /* 0xc1 */ + DWORD unknown_09; /* 0x04 */ + DWORD unknown_13; /* 0x02 */ + DWORD unknown_17; /* 0x50, civ3 has 0x58 - perhaps offset to name or something? */ + DWORD player_name_len; + + DWORD unknown_21; /* 00 */ + DWORD unknown_25; + DWORD unknown_29; + DWORD unknown_33; + DWORD unknown_37; /* 0x50 for civ3 */ + DWORD connect_data_len; + DWORD unknown_45; + DWORD unknown_49; + GUID guidUnknown; + GUID guidApp; + BYTE data[0]; +} dp8pmsg_SetPeerInfo_Local; + +typedef struct dp8pmsg_SetPeerInfo_Game +{ + BYTE protocol_magic; + BYTE unknown_02; + BYTE packet_count; + BYTE unknown_04; /* 02 */ /* -- peer type ID? */ + DWORD unknown_05; /* c2 */ /* also possibly peer type ID, maybe flags? */ + DWORD unknown_09; /* saw 0x78 01 00 00 when we had data, could be offset? */ + DWORD reply_data_len; + BYTE unknown_17[12]; + DWORD player_count; /* FIXME: or our player number */ + DWORD len_unknown_01; /* offset? length of something. its rather odd */ + DWORD game_name_len; + BYTE unknown_x1[24]; + GUID guidUnknown; + GUID guidApp; + DWORD unknown_x2; + DWORD our_player_number; + DWORD unknown_x4; /* 0 */ + DWORD player_count_2; /* FIXME: or our player number */ + DWORD unknown_x5; /* 0 */ + BYTE data[0]; /* dp8pmsg_part_PeerInfo_Player * number of players. + + * (uri + player name) * number of players + + * game name + */ +} dp8pmsg_SetPeerInfo_Game; + +typedef struct dp8pmsg_part_PeerInfo_Player +{ + DPNID player_id; + DWORD unknown_05; /* 0 */ + DWORD unknown_09; /* something rather interesting, indeed */ + DWORD player_number; /* player number, internal? unique in a session */ + DWORD unknown_17; /* 0 */ + DWORD unknown_21; /* 06 for other? 02 for the person recieving the message? */ + DWORD unknown_25; /* some kind of count, odd really */ + DWORD player_name_len; + DWORD unknown_33; /* 0 */ + DWORD player_data_len; + DWORD unknown_41; /* something rather high, normally */ + DWORD uri_len; +} dp8pmsg_part_PeerInfo_Player; + +typedef struct dp8pmsg_SetPeerInfo_Unknown +/* I'm not sure why this is used, I need more testing. + * I'm thinking it may be for sending "hello" to each peer? */ +{ + BYTE protocol_magic; + BYTE unknown_02; + BYTE packet_count; + BYTE unknown_04; /* 02 */ + BYTE unknown_05; /* c3 to send. c5 to recieve rejected, c6 to recieve ok */ + BYTE unknown_06; /* 00 */ + BYTE unknown_07; /* 00 */ + BYTE unknown_08; /* 00 */ +} dp8pmsg_SetPeerInfo_Unknown; + +typedef struct dp8pmsg_SetPeerInfo_Connected +{ /* probably shouldn't be called SetPeerInfo */ + BYTE protocol_magic; + BYTE unknown_02; + BYTE packet_count; + BYTE unknown_04; + DWORD unknown_05; /* c5 = rejected, c6 = accepted */ + DWORD unknown_09; /* 0x80158260 */ + DWORD unknown_13; /* 0 (sample) or 0xc (civ3 rejected) */ + DWORD data_size; /* 0 or 0x21 == length of data */ + BYTE data[0]; +} dp8pmsg_SetPeerInfo_Connected; + +/* MESSAGEDATA */ + +typedef struct dp8pmsg_MessageData +{ + BYTE protocol_magic; + BYTE unknown_02; /* 00 */ + BYTE packet_count; + BYTE unknown_04; + BYTE data[0]; +} dp8pmsg_MessageData; + +#include "poppack.h" + +#endif diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 085b15f..05506bb 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -1,7 +1,7 @@ -/* - * DirectPlay8 Server - * - * Copyright 2004 Raphael Junqueira +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,26 +16,115 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * */ -#include "config.h" - #include <stdarg.h> - +#include <string.h> #include "windef.h" #include "winbase.h" -#include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "objbase.h" #include "wine/debug.h" +#include "winerror.h" #include "dplay8.h" -#include "dpnet_private.h" +#include "dplay8_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + +static ICOM_VTABLE(IDirectPlay8Server) directPlay8ServerVT; + +HRESULT WINAPI DirectPlay8Server_QueryInterface(PDIRECTPLAY8SERVER iface, + REFIID riid, LPVOID *obj) +{ + ICOM_THIS(IDirectPlay8ServerImpl, iface); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IDirectPlay8Server, riid)) + { + This->ref++; + *obj = This; + return S_OK; + } + else + { + FIXME("(%p)->(%s, %p): no interface\n", iface, debugstr_guid(riid), obj); + return E_NOINTERFACE; + } +} -WINE_DEFAULT_DEBUG_CHANNEL(dpnet); +ULONG WINAPI DirectPlay8Server_AddRef(PDIRECTPLAY8SERVER iface) +{ + ICOM_THIS(IDirectPlay8ServerImpl, iface); + TRACE("(%p)->()\n", iface); + return ++This->ref; +} + +ULONG WINAPI DirectPlay8Server_Release(PDIRECTPLAY8SERVER iface) +{ + ICOM_THIS(IDirectPlay8ServerImpl, iface); + TRACE("(%p)->()\n", iface); + if (--This->ref) return This->ref; + + FIXME("destroy this and everything\n"); + + HeapFree(GetProcessHeap(), 0, This); + return 0; +} -HRESULT DPNET_CreateDirectPlay8Server(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { - WARN("(%p, %s, %p): stub.\n", punkOuter, debugstr_guid(riid), ppobj); - return CLASS_E_CLASSNOTAVAILABLE; +HRESULT DPNET_CreateDirectPlay8Server(IUnknown *pOuter, REFIID riid, LPVOID *ppobj) +{ + IDirectPlay8ServerImpl *ipDP8S; + HRESULT hr; + TRACE("()\n"); + ipDP8S = (IDirectPlay8ServerImpl *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(IDirectPlay8ServerImpl)); + if (ipDP8S == NULL) return E_OUTOFMEMORY; + ICOM_VTBL(ipDP8S) = &directPlay8ServerVT; + IDirectPlay8Server_AddRef((IDirectPlay8Server *)ipDP8S); + TRACE("Created new object: %p\n", ipDP8S); + hr = IDirectPlay8Server_QueryInterface((IDirectPlay8Server *)ipDP8S, riid, ppobj); + IDirectPlay8Server_Release((IDirectPlay8Server *)ipDP8S); + if (SUCCEEDED(hr)) + return S_OK; + else + return E_NOINTERFACE; } + +static ICOM_VTABLE(IDirectPlay8Server) directPlay8ServerVT = +{ + DirectPlay8Server_QueryInterface, + DirectPlay8Server_AddRef, + DirectPlay8Server_Release, + (void*)0xdead4004, /* Initilize */ + (void*)0xdead4005, /* EnumServiceProviers */ + (void*)0xdead4006, /* CancelAsyncOperation */ + (void*)0xdead4007, /* GetSendQueueInfo */ + (void*)0xdead4008, /* GetApplicationDesc */ + (void*)0xdead4009, /* SetServerInfo */ + (void*)0xdead400a, /* GetClientInfo */ + (void*)0xdead400b, /* GetClientAddress */ + (void*)0xdead400c, /* GetLocalHostAddresses */ + (void*)0xdead400d, /* SetApplicationDesc */ + (void*)0xdead400e, /* Host */ + (void*)0xdead400f, /* SendTo */ + (void*)0xdead4010, /* CreateGroup */ + (void*)0xdead4011, /* DestroyGroup */ + (void*)0xdead4012, /* AddPlayerToGroup */ + (void*)0xdead4013, /* RemovePlayerFromGroup */ + (void*)0xdead4014, /* SetGroupInfo */ + (void*)0xdead4015, /* GetGroupInfo */ + (void*)0xdead4016, /* EnumPlayersAndGroups */ + (void*)0xdead4017, /* Close */ + (void*)0xdead4018, /* DestroyClient */ + (void*)0xdead4019, /* ReturnBuffer */ + (void*)0xdead401a, /* GetPlayerContext */ + (void*)0xdead401b, /* GetGroupContext */ + (void*)0xdead401c, /* SetCaps */ + (void*)0xdead401d, /* GetCaps */ + (void*)0xdead401e, /* GetConnectionInfo */ + (void*)0xdead401f /* RegisterLobby */ +}; + + diff --git a/dlls/dpnet/session.c b/dlls/dpnet/session.c new file mode 100644 index 0000000..cfb11ae --- /dev/null +++ b/dlls/dpnet/session.c @@ -0,0 +1,2373 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" +#include "wine/debug.h" +#include "winerror.h" +#include "winnt.h" +#include "winreg.h" +#include "winnls.h" +#include "wine/unicode.h" + +#include "dplay8.h" +#include "dplay8_private.h" + +/* DirectPlay 8 session protocol */ + +#include "pshpack1.h" + +/* some packets seem to change with the version + * first message packet: + * ver 5: 3f 00 00 00 (first packet) + * 3f 01 00 00 (retransmits) + * ver 6: 3f 02 00 00 <conn id> (first packet) + * 3f 03 00 00 <conn id> (retransmits) + */ +#define DP8SESS_DEFVER MAKELONG(5, 1) +#define DP8SESS_MINVER(a,b) min(a,b) + +typedef struct { + DWORD size; + DWORD flags; + DWORD max_players; + DWORD cur_players; + /* ofs 16 */ + DWORD name_ofs; + DWORD name_size; + DWORD pass_ofs; + DWORD pass_size; + /* ofs 32 */ + DWORD res_ofs; + DWORD res_size; + DWORD appres_ofs; + DWORD appres_size; + /* ofs 48 */ + GUID instGUID; + /* ofs 64 */ + GUID appGUID; + /* ofs 80 */ +} DP8_AppDesc; + +#define DP8SESS_TAG 0 +#define DP8SESS_ENUM_REQUEST 2 +#define DP8SESS_ENUM_RESPONSE 3 + +#define DP8SESS_ENUM_REQ_WITH_GUID 1 +#define DP8SESS_ENUM_REQ_WITHOUT_GUID 2 + +typedef struct { + BYTE tag; + BYTE command; + WORD id; + /* ofs 4 */ + BYTE type; +} DP8_EnumRequest; + +typedef struct { + BYTE tag; + BYTE command; + WORD id; + /* ofs 4 */ + DWORD reply_ofs; + DWORD reply_size; + /* ofs 12 */ + DP8_AppDesc app_desc; + /* ofs 92 */ +} DP8_EnumResponse; + +#define DP8SESS_PATH_TEST 5 + +typedef struct { + BYTE tag; + BYTE command; + WORD id; + /* ofs 4 */ + DWORD key1; + DWORD key2; +} DP8_PathTest; + +#define DP8SESS_CONNECT 0x88 +#define DP8SESS_CONN_REQUEST 0x01 +#define DP8SESS_CONN_RESPONSE 0x02 + +typedef struct { + BYTE command; + BYTE type; + BYTE pkt; + BYTE unknown_03; + /* ofs 4 */ + DWORD ver; + /* ofs 8 */ + DWORD id; + DWORD time; + /* ofs 16 */ +} DP8_Connect; + +#define DP8SESS_ACKNOWLEDGE 0x80 +#define DP8SESS_ACK_CONNECT 0x02 +#define DP8SESS_ACK_DATA_RELIABLE 0x06 + +typedef struct { + BYTE command; + BYTE type; + WORD unknown_02; + /* ofs 4 */ + DWORD ver; + /* ofs 8 */ + DWORD id; + DWORD time; + /* ofs 16 */ +} DP8_ConnAck; + +typedef struct { + BYTE command; + BYTE type; + WORD unknown_02; + /* ofs 4 */ + BYTE next_out; + BYTE next_in; + WORD unknown_06; + /* ofs 8 */ + DWORD time; + /* ofs 16 */ +} DP8_DataAck; + +#define DP8SESS_MESSAGE 0x7f + +typedef struct { + BYTE command; + BYTE type; + BYTE next_out; + BYTE next_in; + /* ofs 4 */ + DWORD msg; + /* ofs 8 */ +} DP8_Message; + +#define DP8SESS_MSG_PLAYER_CONNECT 0xc1 + +#define DP8SESS_CONNF_SERVER 0x01 +#define DP8SESS_CONNF_CLIENT 0x02 +#define DP8SESS_CONNF_PEER 0x04 + +typedef struct { + DP8_Message msg; + /* ofs 8 */ + DWORD flags; + DWORD dplay_ver; + DWORD name_ofs; + DWORD name_size; + DWORD data_ofs; + DWORD data_size; + DWORD pass_ofs; + DWORD pass_size; + DWORD conn_ofs; + DWORD conn_size; + DWORD url_ofs; + DWORD url_size; + GUID instGUID; + GUID appGUID; + DWORD addr_ofs; + DWORD addr_size; +} DP8_PlayerConnect; + +#define DP8SESS_MSG_SESSION_INFO 0xc2 + +typedef struct { + DP8_Message msg; + /* ofs 8 */ + DWORD reply_ofs; + DWORD reply_size; + /* ofs 16 */ + DP8_AppDesc app_desc; + /* ofs 96 */ + DWORD player_id; + DWORD ver; + DWORD unknown_104; + DWORD entries; + DWORD members; +} DP8_SessionInfo; + +#define DP8SESS_PINFOF_LOCAL 0x0001 +#define DP8SESS_PINFOF_HOST 0x0002 +#define DP8SESS_PINFOF_ALLPLAYER_GROUP 0x0004 +#define DP8SESS_PINFOF_GROUP 0x0010 +#define DP8SESS_PINFOF_MULTICAST_GROUP 0x0020 +#define DP8SESS_PINFOF_AUTODESTRUCT_GROUP 0x0040 +#define DP8SESS_PINFOF_PEER 0x0100 +#define DP8SESS_PINFOF_CLIENT 0x0200 +#define DP8SESS_PINFOF_SERVER 0x0400 +#define DP8SESS_PINFOF_AVAILABLE 0x1000 +#define DP8SESS_PINFOF_CONNECTING 0x2000 +#define DP8SESS_PINFOF_DISCONNECTING 0x4000 + +typedef struct { + DWORD group_id; + DWORD owner_id; + DWORD flags; + DWORD ver; + /* ofs 16 */ + DWORD unknown_16; + DWORD dplay_ver; + DWORD name_ofs; + DWORD name_size; + DWORD data_ofs; + DWORD data_size; + DWORD url_ofs; + DWORD url_size; +} DP8_PlayerInfo; + +#define DP8SESS_MSG_SESSION_ACK 0xc3 + +typedef struct { + DP8_Message msg; +} DP8_SessionAck; + +#define DP8SESS_MSG_PEER_CONNECT 0xc6 + +typedef struct { + DP8_Message msg; + /* ofs 8 */ + DWORD player_id; + DWORD ver; + /* ofs 16 */ + DWORD unknown_16; +} DP8_PeerConnect; + +#define DP8SESS_MSG_TABLE_VER 0xc9 + +typedef struct { + DP8_Message msg; + /* ofs 8 */ + DWORD ver; + /* ofs 12 */ + DWORD unknown_12; +} DP8_TableVer; + +#define DP8SESS_MSG_APPDESC_UPDATE 0xcf + +typedef struct { + DP8_Message msg; + /* ofs 8 */ + DP8_AppDesc app_desc; + /* ofs 88 */ +} DP8_AppDescUpdate; + +#define DP8SESS_DATA_UNRELIABLE 0x37 +#define DP8SESS_DATA_RELIABLE 0x3f + +typedef struct { + BYTE command; + BYTE type; + BYTE next_out; + BYTE next_in; + /* ofs 4 */ +} DP8_Data; + +#include "poppack.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + +static BOOL DPNET_RecvPacket(DirectPlay8GlobalData *, void *, int, IDirectPlay8Address *); +static HRESULT DPNET_StartAsync(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop); + +static HRESULT DPNET_InitSP(DirectPlay8GlobalData *dp8gdData, const GUID *const guidNewSP) +{ + if (!IsEqualGUID(guidNewSP, &dp8gdData->guidSP)) + { + HRESULT hr; + if (dp8gdData->sp) + { + IDirectPlay8ServiceProvider_Release(dp8gdData->sp); + dp8gdData->sp = NULL; + } + memcpy(&dp8gdData->guidSP, guidNewSP, sizeof(GUID)); + hr = CoCreateInstance(&dp8gdData->guidSP, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectPlay8ServiceProvider, + (LPVOID *) &dp8gdData->sp); + if (SUCCEEDED(hr)) + { + IDirectPlay8ServiceProvider_Initialize(dp8gdData->sp, dp8gdData, DPNET_RecvPacket, 0); + } + else + { + WARN("failed to switch to service provider %s\n", debugstr_guid(guidNewSP)); + memset(&dp8gdData->guidSP, 0, sizeof(GUID)); + return hr; + + } + } + return S_OK; +} + +static void DPNET_SetAppDesc(DirectPlay8GlobalData *dp8gdData, const DPN_APPLICATION_DESC *pdnAppDesc) +{ + dp8gdData->appdesc.dwMaxPlayers = max(dp8gdData->appdesc.dwCurrentPlayers, pdnAppDesc->dwMaxPlayers); + if (dp8gdData->appdesc.pwszSessionName != pdnAppDesc->pwszSessionName) { + if (dp8gdData->appdesc.pwszSessionName) + HeapFree(GetProcessHeap(), 0, dp8gdData->appdesc.pwszSessionName); + dp8gdData->appdesc.pwszSessionName = DPNET_strdupW(pdnAppDesc->pwszSessionName); + } + if (dp8gdData->appdesc.pwszPassword != pdnAppDesc->pwszPassword) { + if (dp8gdData->appdesc.pwszPassword) + HeapFree(GetProcessHeap(), 0, dp8gdData->appdesc.pwszPassword); + dp8gdData->appdesc.pwszPassword = DPNET_strdupW(pdnAppDesc->pwszPassword); + } + if (dp8gdData->appdesc.pvApplicationReservedData != pdnAppDesc->pvApplicationReservedData || + dp8gdData->appdesc.dwApplicationReservedDataSize != pdnAppDesc->dwApplicationReservedDataSize) { + if (dp8gdData->appdesc.pvApplicationReservedData) + HeapFree(GetProcessHeap(), 0, dp8gdData->appdesc.pvApplicationReservedData); + if (pdnAppDesc->pvApplicationReservedData && pdnAppDesc->dwApplicationReservedDataSize) { + dp8gdData->appdesc.pvApplicationReservedData = HeapAlloc(GetProcessHeap(), 0, pdnAppDesc->dwApplicationReservedDataSize); + dp8gdData->appdesc.dwApplicationReservedDataSize = pdnAppDesc->dwApplicationReservedDataSize; + memcpy(dp8gdData->appdesc.pvApplicationReservedData, pdnAppDesc->pvApplicationReservedData, pdnAppDesc->dwApplicationReservedDataSize); + } + else { + dp8gdData->appdesc.pvApplicationReservedData = NULL; + dp8gdData->appdesc.dwApplicationReservedDataSize = 0; + } + } +} + +static void DPNET_ReturnBufferToApp(DirectPlay8GlobalData *dp8gdData, HRESULT hr, + PVOID pvBuffer, PVOID pvUserContext) +{ + DPNMSG_RETURN_BUFFER ret; + if (!pvBuffer) return; + ret.dwSize = sizeof(ret); + ret.hResultCode = hr; + ret.pvBuffer = pvBuffer; + ret.pvUserContext = pvUserContext; + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, DPN_MSGID_RETURN_BUFFER, &ret); +} + +static dpPlayer* DPNET_FindPlayerByAddr(DirectPlay8GlobalData *dp8gdData, IDirectPlay8Address *pAddress) +{ + dpPlayer *play; + EnterCriticalSection(&dp8gdData->cs_player); + /* see if the service provider already identified a player */ + play = dp8gdData->remotePlayers; + while (play) { + if (play->pAddress == pAddress) break; + play = play->next; + } + LeaveCriticalSection(&dp8gdData->cs_player); + return play; +} + +static dpPlayer* DPNET_FindPlayerByID(DirectPlay8GlobalData *dp8gdData, DPNID dpnid) +{ + dpPlayer *play; + EnterCriticalSection(&dp8gdData->cs_player); + play = &dp8gdData->localPlayer; + if (play->dwPlayerID != dpnid) { + play = dp8gdData->remotePlayers; + while (play) { + if (play->dwPlayerID == dpnid) break; + play = play->next; + } + } + LeaveCriticalSection(&dp8gdData->cs_player); + return play; +} + +static dpPlayer* DPNET_MakePlayer(DirectPlay8GlobalData *dp8gdData, IDirectPlay8Address *pAddress, BOOL *found) +{ + dpPlayer *play; + EnterCriticalSection(&dp8gdData->cs_player); + /* see if the service provider already identified a player */ + play = dp8gdData->remotePlayers; + while (play) { + if (play->pAddress == pAddress) { + *found = TRUE; + break; + } + play = play->next; + } + if (!play) { + /* create new player */ + *found = FALSE; + play = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(dpPlayer)); + InitializeCriticalSection(&play->cs); + IDirectPlay8Address_Duplicate(pAddress, &play->pAddress); + play->next = dp8gdData->remotePlayers; + dp8gdData->remotePlayers = play; + } + LeaveCriticalSection(&dp8gdData->cs_player); + return play; +} + +static void DPNET_KillPlayer(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + EnterCriticalSection(&dp8gdData->cs_player); + + /* free remote player */ + if (play->prev) play->prev->next = play->next; + else dp8gdData->remotePlayers = play->next; + if (play->next) play->next->prev = play->prev; + DPNET_ReturnBufferToApp(dp8gdData, S_OK, play->conn_data, play->conn_data_ctx); + if (play->reply_data) HeapFree(GetProcessHeap(), 0, play->reply_data); + if (play->pAddress) IDirectPlay8Address_Release(play->pAddress); + if (play->status == PLAYER_ACTIVE) + dp8gdData->appdesc.dwCurrentPlayers--; + DeleteCriticalSection(&play->cs); + HeapFree(GetProcessHeap(), 0, play); + + LeaveCriticalSection(&dp8gdData->cs_player); +} + +void DPNET_KillPlayers(DirectPlay8GlobalData *dp8gdData) +{ + dpPlayer *play; + EnterCriticalSection(&dp8gdData->cs_player); + + /* free remote players */ + while (dp8gdData->remotePlayers) { + play = dp8gdData->remotePlayers; + dp8gdData->remotePlayers = play->next; + if (play->next) play->next->prev = NULL; + DPNET_ReturnBufferToApp(dp8gdData, S_OK, play->conn_data, play->conn_data_ctx); + if (play->reply_data) HeapFree(GetProcessHeap(), 0, play->reply_data); + if (play->pAddress) IDirectPlay8Address_Release(play->pAddress); + DeleteCriticalSection(&play->cs); + HeapFree(GetProcessHeap(), 0, play); + } + + /* free local player */ + play = &dp8gdData->localPlayer; + play->status = PLAYER_UNKNOWN; + if (play->conn_data) { + HeapFree(GetProcessHeap(), 0, play->conn_data); + play->conn_data = NULL; + play->conn_data_len = 0; + } + if (play->pAddress) IDirectPlay8Address_Release(play->pAddress); + play->pAddress = NULL; + + dp8gdData->remoteHost = NULL; + + dp8gdData->appdesc.dwCurrentPlayers = 0; + LeaveCriticalSection(&dp8gdData->cs_player); +} + +static void DPNET_LockPlayer(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + EnterCriticalSection(&play->cs); +} + +static void DPNET_UnlockPlayer(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + LeaveCriticalSection(&play->cs); +} + +static BOOL DPNET_GotAck(DirectPlay8GlobalData *dp8gdData, dpPlayer *play, BYTE next_out, BYTE next_in) +{ + /* FIXME: what about wraparound, eh? */ + + if (next_in > play->next_out) { + TRACE("bah, there's ghosts in the machine! got %d, sent %d\n", next_in, play->next_out); + } + if (next_in > play->ack_out) { + /* they've received our packets */ + TRACE("acknowledge out: from %d to %d, sent %d\n", play->ack_out, next_in, play->next_out); + play->ack_out = next_in; + } + else if (next_in < play->ack_out) { + /* they haven't received them yet */ + TRACE("bah, we got an old acknowledge! last %d, got %d\n", play->ack_out, next_in); + } + + if (next_out > play->next_in) { + /* we haven't received all their packets */ + TRACE("bah, we're missing a packet! expected %d, got %d\n", play->next_in, next_out); + return FALSE; + } + else if (next_out < play->next_in) { + /* delayed packet? */ + TRACE("bah, we got an old packet! expected %d, got %d\n", play->next_in, next_out); + return FALSE; + } + + return TRUE; +} + +static int DPNET_ParseAppDesc(DirectPlay8GlobalData *dp8gdData, DPN_APPLICATION_DESC *tdesc, DP8_AppDesc *sdesc, LPVOID src) +{ + LPBYTE pk = src; + memset(tdesc, 0, sizeof(*tdesc)); + tdesc->dwSize = sizeof(*tdesc); + tdesc->dwFlags = sdesc->flags; + memcpy(&tdesc->guidInstance, &sdesc->instGUID, sizeof(GUID)); + memcpy(&tdesc->guidApplication, &sdesc->appGUID, sizeof(GUID)); + tdesc->dwMaxPlayers = sdesc->max_players; + tdesc->dwCurrentPlayers = sdesc->cur_players; + tdesc->pwszSessionName = sdesc->name_ofs ? (LPVOID)(pk + sdesc->name_ofs) : NULL; + tdesc->pwszPassword = sdesc->pass_ofs ? (LPVOID)(pk + sdesc->pass_ofs) : NULL; + tdesc->pvReservedData = sdesc->res_ofs ? (LPVOID)(pk + sdesc->res_ofs) : NULL; + tdesc->dwReservedDataSize = sdesc->res_size; + tdesc->pvApplicationReservedData = sdesc->appres_ofs ? (LPVOID)(pk + sdesc->appres_ofs) : NULL; + tdesc->dwApplicationReservedDataSize = sdesc->appres_size; + return sdesc->name_size + sdesc->pass_size + sdesc->res_size + sdesc->appres_size; +} + +static int DPNET_SizeAppDesc(DirectPlay8GlobalData *dp8gdData, DPN_APPLICATION_DESC *sdesc) +{ + int sz = 0; + if (sdesc->pwszSessionName) + sz += (strlenW(sdesc->pwszSessionName)+1)*sizeof(WCHAR); + if (sdesc->pwszPassword) + sz += (strlenW(sdesc->pwszPassword)+1)*sizeof(WCHAR); + sz += sdesc->dwReservedDataSize; + sz += sdesc->dwApplicationReservedDataSize; + return sz; +} + +static LPBYTE DPNET_FormatAppDesc(DirectPlay8GlobalData *dp8gdData, DP8_AppDesc *tdesc, DPN_APPLICATION_DESC *sdesc, LPVOID dst, LPVOID end) +{ + LPBYTE pk = dst; + LPBYTE ptr = end; + memset(tdesc, 0, sizeof(*tdesc)); + tdesc->size = sizeof(*tdesc); + tdesc->flags = sdesc->dwFlags; + memcpy(&tdesc->instGUID, &sdesc->guidInstance, sizeof(GUID)); + memcpy(&tdesc->appGUID, &sdesc->guidApplication, sizeof(GUID)); + tdesc->max_players = sdesc->dwMaxPlayers; + tdesc->cur_players = sdesc->dwCurrentPlayers; + if (sdesc->pwszSessionName) { + DWORD len = (strlenW(sdesc->pwszSessionName)+1)*sizeof(WCHAR); + memcpy(ptr, sdesc->pwszSessionName, len); + tdesc->name_ofs = ptr - pk; + tdesc->name_size = len; + ptr += len; + } + if (sdesc->pwszPassword) { + DWORD len = (strlenW(sdesc->pwszPassword)+1)*sizeof(WCHAR); + memcpy(ptr, sdesc->pwszPassword, len); + tdesc->pass_ofs = ptr - pk; + tdesc->pass_size = len; + ptr += len; + } + if (sdesc->dwReservedDataSize) { + DWORD len = sdesc->dwReservedDataSize; + memcpy(ptr, sdesc->pvReservedData, len); + tdesc->res_ofs = ptr - pk; + tdesc->res_size = len; + ptr += len; + } + if (sdesc->dwApplicationReservedDataSize) { + DWORD len = sdesc->dwApplicationReservedDataSize; + memcpy(ptr, sdesc->pvApplicationReservedData, len); + tdesc->res_ofs = ptr - pk; + tdesc->res_size = len; + ptr += len; + } + return ptr; +} + +static HRESULT DPNET_SendEnumResponse(DirectPlay8GlobalData *dp8gdData, IDirectPlay8Address *pAddr, WORD id, GUID* guidApp, + PVOID pvResponseData, DWORD dwResponseDataSize, PVOID pvResponseContext) +{ + DPNET_AsyncOp *aop; + DP8_EnumResponse *msg; + LPBYTE ptr; + int sz; + + TRACE("...\n"); + + EnterCriticalSection(&dp8gdData->cs_player); + + sz = DPNET_SizeAppDesc(dp8gdData, &dp8gdData->appdesc); + + aop = DPNET_AsyncAlloc(dp8gdData, 0, sizeof(*msg) + sz); + aop->dwType = 0; + aop->dwFlags = 0; + aop->pvUserContext = pvResponseContext; + IDirectPlay8Address_AddRef(pAddr); + aop->pAddrHost = pAddr; + aop->pAddrDev = NULL; /* FIXME */ + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->tag = DP8SESS_TAG; + msg->command = DP8SESS_ENUM_RESPONSE; + msg->id = id; + + ptr = DPNET_FormatAppDesc(dp8gdData, &msg->app_desc, &dp8gdData->appdesc, &msg->reply_ofs, msg+1); + + if (pvResponseData && dwResponseDataSize) { + msg->reply_ofs = ptr - (LPBYTE)&msg->reply_ofs; + msg->reply_size = dwResponseDataSize; + aop->cUserBuffer++; + aop->UserBuffer[0].pBufferData = pvResponseData; + aop->UserBuffer[0].dwBufferSize = dwResponseDataSize; + } + + aop->dwID = msg->id; + aop->forget = TRUE; + + LeaveCriticalSection(&dp8gdData->cs_player); + + DPNET_StartAsync(dp8gdData, aop); + + /* FIXME: do this in StartAsync when it's done? */ + DPNET_ReturnBufferToApp(dp8gdData, S_OK, pvResponseData, pvResponseContext); + + return S_OK; +} + +static HRESULT DPNET_SendConnectResponse(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + IDirectPlay8Address *pAddr = play->pAddress; + DPNET_AsyncOp *aop; + DP8_Connect *msg; + + TRACE("...\n"); + + aop = DPNET_AsyncAlloc(dp8gdData, 0, sizeof(*msg)); + aop->dwType = 0; + aop->dwFlags = 0; + IDirectPlay8Address_AddRef(pAddr); + aop->pAddrHost = pAddr; + aop->pAddrDev = NULL; /* FIXME */ + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->command = DP8SESS_CONNECT; + msg->type = DP8SESS_CONN_RESPONSE; + msg->pkt = 0; + msg->ver = DP8SESS_DEFVER; + msg->id = play->conn_id; + msg->time = GetTickCount(); + + aop->dwID = msg->id; + aop->forget = TRUE; + + DPNET_StartAsync(dp8gdData, aop); + + return S_OK; +} + +static HRESULT DPNET_SendConnectAck(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + IDirectPlay8Address *pAddr = play->pAddress; + DPNET_AsyncOp *aop; + DP8_ConnAck *msg; + + TRACE("...\n"); + + aop = DPNET_AsyncAlloc(dp8gdData, 0, sizeof(*msg)); + aop->dwType = 0; + aop->dwFlags = 0; + IDirectPlay8Address_AddRef(pAddr); + aop->pAddrHost = pAddr; + aop->pAddrDev = NULL; /* FIXME */ + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->command = DP8SESS_ACKNOWLEDGE; + msg->type = DP8SESS_ACK_CONNECT; + msg->unknown_02 = 1; + msg->ver = play->ver; + msg->id = play->conn_id; + msg->time = GetTickCount(); + + aop->dwID = msg->id; + aop->forget = TRUE; + + DPNET_StartAsync(dp8gdData, aop); + + return S_OK; +} + +static HRESULT DPNET_SendPathTest(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + IDirectPlay8Address *pAddr = play->pAddress; + DPNET_AsyncOp *aop; + DP8_PathTest *msg; + + TRACE("...\n"); + + aop = DPNET_AsyncAlloc(dp8gdData, 0, sizeof(*msg)); + aop->dwType = 0; + aop->dwFlags = 0; + IDirectPlay8Address_AddRef(pAddr); + aop->pAddrHost = pAddr; + aop->pAddrDev = NULL; /* FIXME */ + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->tag = DP8SESS_TAG; + msg->command = DP8SESS_PATH_TEST; + msg->id = 0x2551; + msg->key1 = DPNET_Random(dp8gdData); + msg->key2 = DPNET_Random(dp8gdData) * 49; + + aop->dwID = msg->key1; + aop->forget = TRUE; + + DPNET_StartAsync(dp8gdData, aop); + + return S_OK; +} + +static HRESULT DPNET_SendNoData(DirectPlay8GlobalData *dp8gdData, dpPlayer *play, BYTE type, WORD pkt) +{ + IDirectPlay8Address *pAddr = play->pAddress; + DPNET_AsyncOp *aop; + DP8_Data *msg; + + TRACE("...\n"); + + aop = DPNET_AsyncAlloc(dp8gdData, 0, sizeof(*msg)); + aop->dwType = 0; + aop->dwFlags = 0; + IDirectPlay8Address_AddRef(pAddr); + aop->pAddrHost = pAddr; + aop->pAddrDev = NULL; /* FIXME */ + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->command = DP8SESS_DATA_RELIABLE; + msg->type = type; + msg->next_out = play->next_out++; + msg->next_in = play->next_in; + play->ack_in = play->next_in; + + aop->dwID = msg->next_out; + aop->forget = TRUE; + + DPNET_StartAsync(dp8gdData, aop); + + return S_OK; +} + +static HRESULT DPNET_SendDataAck(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + IDirectPlay8Address *pAddr = play->pAddress; + DPNET_AsyncOp *aop; + DP8_DataAck *msg; + + TRACE("...\n"); + + aop = DPNET_AsyncAlloc(dp8gdData, 0, sizeof(*msg)); + aop->dwType = 0; + aop->dwFlags = 0; + IDirectPlay8Address_AddRef(pAddr); + aop->pAddrHost = pAddr; + aop->pAddrDev = NULL; /* FIXME */ + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->command = DP8SESS_ACKNOWLEDGE; + msg->type = DP8SESS_ACK_DATA_RELIABLE; + msg->unknown_02 = 1; + msg->next_out = play->next_out; + msg->next_in = play->next_in; + play->ack_in = play->next_in; + msg->time = GetTickCount(); + + aop->dwID = msg->next_out; + aop->forget = TRUE; + + DPNET_StartAsync(dp8gdData, aop); + + return S_OK; +} + +static HRESULT DPNET_SendDataAck2(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + IDirectPlay8Address *pAddr = play->pAddress; + DPNET_AsyncOp *aop; + DP8_DataAck *msg; + + TRACE("...\n"); + + aop = DPNET_AsyncAlloc(dp8gdData, 0, sizeof(*msg) + sizeof(DWORD)); + aop->dwType = 0; + aop->dwFlags = 0; + IDirectPlay8Address_AddRef(pAddr); + aop->pAddrHost = pAddr; + aop->pAddrDev = NULL; /* FIXME */ + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->command = DP8SESS_ACKNOWLEDGE; + msg->type = DP8SESS_ACK_DATA_RELIABLE; + msg->unknown_02 = 3; + msg->next_out = play->next_out; + msg->next_in = play->next_in; + play->ack_in = play->next_in; + msg->time = GetTickCount(); + *(DWORD*)(msg+1) = 1; + + aop->dwID = msg->next_out; + aop->forget = TRUE; + + DPNET_StartAsync(dp8gdData, aop); + + return S_OK; +} + +static HRESULT DPNET_SendPlayerConnect(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + IDirectPlay8Address *pAddr = play->pAddress; + DPNET_AsyncOp *aop; + DP8_PlayerConnect *msg; + dpPlayer *lplay = &dp8gdData->localPlayer; + LPBYTE pk, ptr; + DWORD name_len; + + TRACE("...\n"); + + DPNET_LockPlayer(dp8gdData, lplay); + + name_len = lplay->name ? (strlenW(lplay->name)+1)*sizeof(WCHAR) : 0; + + aop = DPNET_AsyncAlloc(dp8gdData, 0, sizeof(*msg) + + lplay->conn_data_len + name_len + lplay->data_len); + aop->dwType = 0; + aop->dwFlags = 0; + IDirectPlay8Address_AddRef(pAddr); + aop->pAddrHost = pAddr; + aop->pAddrDev = NULL; /* FIXME */ + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->msg.command = DP8SESS_MESSAGE; + msg->msg.type = 0; + msg->msg.next_out = play->next_out++; + msg->msg.next_in = play->next_in; + play->ack_in = msg->msg.next_in; + msg->msg.msg = DP8SESS_MSG_PLAYER_CONNECT; + + pk = (LPBYTE)msg + sizeof(msg->msg); + + msg->flags = DP8SESS_CONNF_PEER; + msg->dplay_ver = 7; + memcpy(&msg->instGUID, &dp8gdData->appdesc.guidInstance, sizeof(GUID)); + memcpy(&msg->appGUID, &dp8gdData->appdesc.guidApplication, sizeof(GUID)); + + ptr = (LPBYTE)(msg+1); + + /* FIXME: add address */ + /* FIXME: add password */ + /* FIXME: add url */ + + /* connect data */ + if (lplay->conn_data_len) { + msg->conn_ofs = ptr - pk; + msg->conn_size = lplay->conn_data_len; + memcpy(ptr, lplay->conn_data, lplay->conn_data_len); + ptr += lplay->conn_data_len; + } + + /* name */ + if (lplay->name) { + msg->name_ofs = ptr - pk; + msg->name_size = name_len; + memcpy(ptr, lplay->name, name_len); + ptr += name_len; + } + + /* player data */ + if (lplay->data_len) { + msg->data_ofs = ptr - pk; + msg->data_size = lplay->data_len; + memcpy(ptr, lplay->conn_data, lplay->data_len); + ptr += lplay->data_len; + } + + aop->dwID = msg->msg.next_out; + aop->forget = TRUE; + + DPNET_StartAsync(dp8gdData, aop); + + DPNET_UnlockPlayer(dp8gdData, lplay); + + return S_OK; +} + +static HRESULT DPNET_SendSessionInfo(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + IDirectPlay8Address *pAddr = play->pAddress; + DPNET_AsyncOp *aop; + DP8_SessionInfo *msg; + DP8_PlayerInfo *pi; + dpPlayer *cplay; + DWORD players; + LPBYTE pk, ptr; + int sz; + + TRACE("...\n"); + + EnterCriticalSection(&dp8gdData->cs_player); + + sz = sizeof(*msg); + sz += DPNET_SizeAppDesc(dp8gdData, &dp8gdData->appdesc); + sz += play->conn_data_len; + + /* count players */ + players = 0; + cplay = &dp8gdData->localPlayer; + players++; + sz += sizeof(DP8_PlayerInfo); + if (cplay->name) + sz += (strlenW(cplay->name)+1)*sizeof(WCHAR); + if (cplay->data) + sz += cplay->data_len; + /* don't attach URL to ourselves */ + cplay = dp8gdData->remotePlayers; + while (cplay) { + if (cplay->status == PLAYER_ACCEPTED || + cplay->status == PLAYER_ACTIVE) { + DWORD url_len = 0; + players++; + sz += sizeof(DP8_PlayerInfo); + IDirectPlay8Address_GetURLA(cplay->pAddress, NULL, &url_len); + sz += url_len; + if (cplay->name) + sz += (strlenW(cplay->name)+1)*sizeof(WCHAR); + if (cplay->data) + sz += cplay->data_len; + } + cplay = cplay->next; + } + + aop = DPNET_AsyncAlloc(dp8gdData, 0, sz); + aop->dwType = 0; + aop->dwFlags = 0; + IDirectPlay8Address_AddRef(pAddr); + aop->pAddrHost = pAddr; + aop->pAddrDev = NULL; /* FIXME */ + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->msg.command = DP8SESS_MESSAGE; + msg->msg.type = 0; + msg->msg.next_out = play->next_out++; + msg->msg.next_in = play->next_in; + play->ack_in = msg->msg.next_in; + msg->msg.msg = DP8SESS_MSG_SESSION_INFO; + + pk = (LPBYTE)msg + sizeof(msg->msg); + + msg->player_id = play->dwPlayerID; + msg->ver = 3; + + msg->entries = players; + + pi = (LPVOID)(msg+1); + + ptr = (LPVOID)(pi+players); + + /* players */ + cplay = &dp8gdData->localPlayer; + pi->group_id = cplay->dwPlayerID; + pi->flags = DP8SESS_PINFOF_PEER; + if (dp8gdData->is_host) + pi->flags |= DP8SESS_PINFOF_HOST; + pi->ver = 2; + pi->dplay_ver = cplay->dplay_ver; + if (cplay->name) { + DWORD len = (strlenW(cplay->name)+1)*sizeof(WCHAR); + pi->name_ofs = ptr - pk; + pi->name_size = len; + memcpy(ptr, cplay->name, len); + ptr += len; + } + if (cplay->data) { + pi->data_ofs = ptr - pk; + pi->data_size = cplay->data_len; + memcpy(ptr, cplay->data, cplay->data_len); + ptr += cplay->data_len; + } + pi++; + + cplay = dp8gdData->remotePlayers; + while (cplay) { + if (cplay->status == PLAYER_ACCEPTED || + cplay->status == PLAYER_ACTIVE) { + DWORD url_len = sz - (ptr - (LPBYTE)msg); + + pi->group_id = cplay->dwPlayerID; + pi->flags = DP8SESS_PINFOF_PEER; + if (cplay == dp8gdData->remoteHost) + pi->flags |= DP8SESS_PINFOF_HOST; + pi->ver = 2; + pi->dplay_ver = cplay->dplay_ver; + + IDirectPlay8Address_GetURLA(cplay->pAddress, (LPVOID)ptr, &url_len); + pi->url_ofs = ptr - pk; + pi->url_size = url_len; + ptr += url_len; + + if (cplay->name) { + DWORD len = (strlenW(cplay->name)+1)*sizeof(WCHAR); + pi->name_ofs = ptr - pk; + pi->name_size = len; + memcpy(ptr, cplay->name, len); + ptr += len; + } + if (cplay->data) { + pi->data_ofs = ptr - pk; + pi->data_size = cplay->data_len; + memcpy(ptr, cplay->data, cplay->data_len); + ptr += cplay->data_len; + } + pi++; + } + cplay = cplay->next; + } + + ptr = DPNET_FormatAppDesc(dp8gdData, &msg->app_desc, &dp8gdData->appdesc, pk, ptr); + + /* attach reply data from INDICATE_CONNECT */ + if (play->conn_data_len) { + msg->reply_ofs = ptr - pk; + msg->reply_size = play->conn_data_len; + memcpy(ptr, play->conn_data, play->conn_data_len); + ptr += play->conn_data_len; + } + + aop->dwID = msg->msg.next_out; + aop->forget = TRUE; + + DPNET_StartAsync(dp8gdData, aop); + + LeaveCriticalSection(&dp8gdData->cs_player); + + /* release reply data */ + DPNET_ReturnBufferToApp(dp8gdData, S_OK, play->conn_data, play->conn_data_ctx); + play->conn_data = NULL; + play->conn_data_len = 0; + play->conn_data_ctx = 0; + + return S_OK; +} + +static HRESULT DPNET_SendSessionAck(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + IDirectPlay8Address *pAddr = play->pAddress; + DPNET_AsyncOp *aop; + DP8_SessionAck *msg; + + TRACE("...\n"); + + aop = DPNET_AsyncAlloc(dp8gdData, 0, sizeof(*msg)); + aop->dwType = 0; + aop->dwFlags = 0; + IDirectPlay8Address_AddRef(pAddr); + aop->pAddrHost = pAddr; + aop->pAddrDev = NULL; /* FIXME */ + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->msg.command = DP8SESS_MESSAGE; + msg->msg.type = 0; + msg->msg.next_out = play->next_out++; + msg->msg.next_in = play->next_in; + play->ack_in = play->next_in; + msg->msg.msg = DP8SESS_MSG_SESSION_ACK; + + aop->dwID = msg->msg.next_out; + aop->forget = TRUE; + + DPNET_StartAsync(dp8gdData, aop); + + return S_OK; +} + +static HRESULT DPNET_SendAppDescUpdate(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + IDirectPlay8Address *pAddr = play->pAddress; + DPNET_AsyncOp *aop; + DP8_AppDescUpdate *msg; + int sz; + + TRACE("...\n"); + + EnterCriticalSection(&dp8gdData->cs_player); + + sz = DPNET_SizeAppDesc(dp8gdData, &dp8gdData->appdesc); + + aop = DPNET_AsyncAlloc(dp8gdData, 0, sizeof(*msg) + sz); + aop->dwType = 0; + aop->dwFlags = 0; + IDirectPlay8Address_AddRef(pAddr); + aop->pAddrHost = pAddr; + aop->pAddrDev = NULL; /* FIXME */ + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->msg.command = DP8SESS_MESSAGE; + msg->msg.type = 0; + msg->msg.next_out = play->next_out++; + msg->msg.next_in = play->next_in; + play->ack_in = play->next_in; + msg->msg.msg = DP8SESS_MSG_APPDESC_UPDATE; + + DPNET_FormatAppDesc(dp8gdData, &msg->app_desc, &dp8gdData->appdesc, &msg->app_desc, msg+1); + + aop->dwID = msg->msg.next_out; + aop->forget = TRUE; + + LeaveCriticalSection(&dp8gdData->cs_player); + + DPNET_StartAsync(dp8gdData, aop); + + return S_OK; +} + +static HRESULT DPNET_SendPeerConnect(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + IDirectPlay8Address *pAddr = play->pAddress; + DPNET_AsyncOp *aop; + DP8_PeerConnect *msg; + + TRACE("...\n"); + + aop = DPNET_AsyncAlloc(dp8gdData, 0, sizeof(*msg)); + aop->dwType = 0; + aop->dwFlags = 0; + IDirectPlay8Address_AddRef(pAddr); + aop->pAddrHost = pAddr; + aop->pAddrDev = NULL; /* FIXME */ + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->msg.command = DP8SESS_MESSAGE; + msg->msg.type = 0; + msg->msg.next_out = play->next_out++; + msg->msg.next_in = play->next_in; + play->ack_in = play->next_in; + msg->msg.msg = DP8SESS_MSG_PEER_CONNECT; + msg->player_id = play->dwPlayerID; + msg->ver = 4; + + aop->dwID = msg->msg.next_out; + aop->forget = TRUE; + + DPNET_StartAsync(dp8gdData, aop); + + return S_OK; +} + +static HRESULT DPNET_SendTableVer(DirectPlay8GlobalData *dp8gdData, dpPlayer *play) +{ + IDirectPlay8Address *pAddr = play->pAddress; + DPNET_AsyncOp *aop; + DP8_TableVer *msg; + + TRACE("...\n"); + + aop = DPNET_AsyncAlloc(dp8gdData, 0, sizeof(*msg)); + aop->dwType = 0; + aop->dwFlags = 0; + IDirectPlay8Address_AddRef(pAddr); + aop->pAddrHost = pAddr; + aop->pAddrDev = NULL; /* FIXME */ + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->msg.command = DP8SESS_MESSAGE; + msg->msg.type = 0; + msg->msg.next_out = play->next_out++; + msg->msg.next_in = play->next_in; + play->ack_in = play->next_in; + msg->msg.msg = DP8SESS_MSG_TABLE_VER; + msg->ver = 4; + + aop->dwID = msg->msg.next_out; + aop->forget = TRUE; + + DPNET_StartAsync(dp8gdData, aop); + + return S_OK; +} + +static BOOL DPNET_ParseSessionInfo(DirectPlay8GlobalData *dp8gdData, void *pk, int pklen, dpPlayer *play) +{ + DP8_SessionInfo *msg = pk; + DP8_PlayerInfo *pi; + DPN_APPLICATION_DESC desc; + dpPlayer *cplay = &dp8gdData->localPlayer; + IDirectPlay8Address *pAddr = NULL; + HRESULT hr; + LPBYTE p; + DWORD c; + + if (cplay->status != PLAYER_CONNECTED) { + TRACE("skipping!\n"); + return FALSE; + } + + play->status = PLAYER_ACCEPTED; + cplay->status = PLAYER_ACCEPTED; + + hr = DPNET_CreateDirectPlay8Address(NULL, &IID_IDirectPlay8Address, (LPVOID *)&pAddr); + + DPNET_ParseAppDesc(dp8gdData, &desc, &msg->app_desc, &msg->reply_ofs); + + EnterCriticalSection(&dp8gdData->cs_player); + + memcpy(&dp8gdData->appdesc.guidInstance, &desc.guidInstance, sizeof(GUID)); + memcpy(&dp8gdData->appdesc.guidApplication, &desc.guidApplication, sizeof(GUID)); + DPNET_SetAppDesc(dp8gdData, &desc); + + p = (LPBYTE)msg + sizeof(msg->msg); + + /* players */ + pi = (LPVOID)(msg+1); + for (c=0; c<msg->entries; c++) { + BOOL was_new = FALSE; + dpPlayer *nplay; + nplay = DPNET_FindPlayerByID(dp8gdData, pi->group_id); + if (!nplay) { + /* not previously identified player */ + was_new = TRUE; + if (pi->group_id == msg->player_id) { + /* it's us */ + nplay = &dp8gdData->localPlayer; + nplay->dwPlayerID = msg->player_id; + } else + if (pi->url_size) { + /* it's a new player */ + BOOL found; + IDirectPlay8Address_BuildFromURLA(pAddr, (LPVOID)(p + pi->url_ofs)); + nplay = DPNET_MakePlayer(dp8gdData, pAddr, &found); + nplay->status = PLAYER_ACCEPTED; + } else { + /* it's our host */ + nplay = dp8gdData->remoteHost; + nplay->dwPlayerID = pi->group_id; + } + } + + nplay->dplay_ver = pi->dplay_ver; + if (nplay->name) { + HeapFree(GetProcessHeap(), 0, nplay->name); + nplay->name = NULL; + } + if (nplay->data) { + HeapFree(GetProcessHeap(), 0, nplay->data); + nplay->data = NULL; + nplay->data_len = 0; + } + if (pi->name_size) { + nplay->name = HeapAlloc(GetProcessHeap(), 0, pi->name_size); + memcpy(nplay->name, p + pi->name_ofs, pi->name_size); + } + if (pi->data_size) { + nplay->data = HeapAlloc(GetProcessHeap(), 0, pi->data_size); + memcpy(nplay->data, p + pi->data_ofs, pi->data_size); + } + + if (was_new) { + DPNMSG_CREATE_PLAYER resp; + memset(&resp, 0, sizeof(resp)); + resp.dwSize = sizeof(resp); + resp.dpnidPlayer = nplay->dwPlayerID; + resp.pvPlayerContext = nplay->pvPlayerContext; + TRACE("dispatching Player Creation\n"); + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, DPN_MSGID_CREATE_PLAYER, &resp); + TRACE("returned 0x%08x\n", hr); + nplay->pvPlayerContext = resp.pvPlayerContext; + if (nplay != &dp8gdData->localPlayer) { + nplay->status = PLAYER_ACTIVE; + dp8gdData->appdesc.dwCurrentPlayers++; + } + } + + pi++; + } + + /* grab connection reply data */ + if (play->reply_data) { + HeapFree(GetProcessHeap(), 0, play->reply_data); + play->reply_data = NULL; + play->reply_data_len = 0; + } + if (msg->reply_size) { + play->reply_data = HeapAlloc(GetProcessHeap(), 0, msg->reply_size); + memcpy(play->reply_data, p + msg->reply_ofs, msg->reply_size); + } + + LeaveCriticalSection(&dp8gdData->cs_player); + + IDirectPlay8Address_Release(pAddr); + + return TRUE; +} + +static void DPNET_RecvMessage(DirectPlay8GlobalData *dp8gdData, void *pk, int pklen, dpPlayer *play) +{ + DP8_Message *pm = pk; + LPBYTE hdr = (LPVOID)(pm+1); + DPNET_AsyncOp *aop = NULL; + HRESULT hr; + + switch (pm->msg) { + case DP8SESS_MSG_PLAYER_CONNECT: + if (dp8gdData->is_host) { + DP8_PlayerConnect *msg = pk; + + DPNET_LockPlayer(dp8gdData, play); + if (play->status == PLAYER_CONNECTED) { + DPNMSG_INDICATE_CONNECT resp; + + play->dplay_ver = msg->dplay_ver; + /* FIXME: verify flags? */ + /* FIXME: verify password? */ + /* FIXME: verify GUIDs? */ + /* FIXME: grab address? */ + + if (msg->name_size) { + play->name = HeapAlloc(GetProcessHeap(), 0, msg->name_size); + memcpy(play->name, (LPVOID)(hdr + msg->name_ofs), msg->name_size); + TRACE("player name: %s\n", debugstr_w(play->name)); + } + + if (msg->data_size) { + play->data = HeapAlloc(GetProcessHeap(), 0, msg->data_size); + memcpy(play->name, (LPVOID)(hdr + msg->data_ofs), msg->data_size); + play->data_len = msg->data_size; + } + + memset(&resp, 0, sizeof(resp)); + resp.dwSize = sizeof(resp); + resp.pAddressPlayer = play->pAddress; + resp.pAddressDevice = NULL; /* FIXME */ + TRACE("connect data size: %d\n", msg->conn_size); + if (msg->conn_size) { + resp.pvUserConnectData = (LPVOID)(hdr + msg->conn_ofs); + resp.dwUserConnectDataSize = msg->conn_size; + } + TRACE("dispatching Connect indication\n"); + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, DPN_MSGID_INDICATE_CONNECT, &resp); + TRACE("returned 0x%08x\n", hr); + if (hr != DPN_OK) { + /* connection rejected */ + play->status = PLAYER_REJECTED; + DPNET_UnlockPlayer(dp8gdData, play); + /* FIXME: send reject response */ + break; + } + /* player accepted, allocate ID and stuff */ + play->dwPlayerID = InterlockedExchangeAdd(&dp8gdData->player_id, 1); + play->pvPlayerContext = resp.pvPlayerContext; + play->status = PLAYER_ACCEPTED; + play->conn_data = resp.pvReplyData; + play->conn_data_len = resp.dwReplyDataSize; + play->conn_data_ctx = resp.pvReplyContext; + DPNET_SendSessionInfo(dp8gdData, play); + } + DPNET_UnlockPlayer(dp8gdData, play); + break; + } + TRACE("ignoring player message since we're not hosting\n"); + break; + case DP8SESS_MSG_SESSION_INFO: + if (!dp8gdData->is_host && play == dp8gdData->remoteHost) { + if (!DPNET_ParseSessionInfo(dp8gdData, pk, pklen, play)) + break; + + DPNET_SendSessionAck(dp8gdData, play); + DPNET_SendPathTest(dp8gdData, play); + break; + } + TRACE("ignoring session info message since it's not from host\n"); + break; + case DP8SESS_MSG_SESSION_ACK: + if (dp8gdData->is_host) { + /* FIXME: Windows's appdesc packet contains the updated number of players + * (including the connecting one) */ + + /* DPNET_SendAppDescUpdate(dp8gdData, play); */ + DPNET_SendPeerConnect(dp8gdData, play); + } + break; + case DP8SESS_MSG_PEER_CONNECT: + if (!dp8gdData->is_host) { + /* FIXME: what else to do here? */ + + DPNET_SendTableVer(dp8gdData, play); + + /* FIXME: when exactly are we fully connected? + * Well, this seems close enough for now, I think. */ + if (dp8gdData->localPlayer.status == PLAYER_ACCEPTED) { + DPNMSG_CONNECT_COMPLETE resp; + + aop = DPNET_AsyncSearch(dp8gdData, DPN_MSGID_CONNECT_COMPLETE, 0); + + memset(&resp, 0, sizeof(resp)); + resp.dwSize = sizeof(resp); + if (aop) { + resp.hAsyncOp = (DPNHANDLE)aop; + resp.pvUserContext = aop->pvUserContext; + } + resp.hResultCode = S_OK; + resp.dpnidLocal = dp8gdData->localPlayer.dwPlayerID; + resp.pvApplicationReplyData = play->reply_data; + resp.dwApplicationReplyDataSize = play->reply_data_len; + TRACE("dispatching Connect completion\n"); + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, DPN_MSGID_CONNECT_COMPLETE, &resp); + TRACE("returned 0x%08x\n", hr); + dp8gdData->localPlayer.status = PLAYER_ACTIVE; + dp8gdData->appdesc.dwCurrentPlayers++; + + if (aop) { + DPNET_AsyncRemove(dp8gdData, aop); + DPNET_AsyncSignal(dp8gdData, aop); + } + } + } + break; + case DP8SESS_MSG_TABLE_VER: + if (dp8gdData->is_host) { + /* FIXME: when exactly is the player fully connected? + * Well, this seems close enough for now, I think; + * it's supposed to connected to the other peers and stuff, + * but that's not implemented yet */ + DPNET_LockPlayer(dp8gdData, play); + if (play->status == PLAYER_ACCEPTED) { + DPNMSG_CREATE_PLAYER resp; + memset(&resp, 0, sizeof(resp)); + resp.dwSize = sizeof(resp); + resp.dpnidPlayer = play->dwPlayerID; + resp.pvPlayerContext = play->pvPlayerContext; + TRACE("dispatching Player Creation\n"); + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, DPN_MSGID_CREATE_PLAYER, &resp); + TRACE("returned 0x%08x\n", hr); + play->pvPlayerContext = resp.pvPlayerContext; + play->status = PLAYER_ACTIVE; + /* DPNET_SendNoData(dp8gdData, play, 0x0, 0x0); */ + } + DPNET_SendDataAck(dp8gdData, play); + DPNET_UnlockPlayer(dp8gdData, play); + } + break; + default: + TRACE("unknown packet, but acknowledging anyway\n"); + DPNET_SendDataAck(dp8gdData, play); + } +} + +static BOOL DPNET_RecvData(DirectPlay8GlobalData *dp8gdData, void *pk, int pklen, dpPlayer *play, DWORD flags, DPNHANDLE buf) +{ + DPNMSG_RECEIVE resp; + HRESULT hr; + + if (!pklen) return FALSE; + + memset(&resp, 0, sizeof(resp)); + resp.dwSize = sizeof(resp); + resp.dpnidSender = play->dwPlayerID; + resp.pvPlayerContext = play->pvPlayerContext; + resp.pReceiveData = pk; + resp.dwReceiveDataSize = pklen; + resp.hBufferHandle = buf; + resp.dwReceiveFlags = flags; + TRACE("dispatching Receive (ptr %p, len %d)\n", pk, pklen); + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, DPN_MSGID_RECEIVE, &resp); + TRACE("returned 0x%08x\n", hr); + return (hr == DPNSUCCESS_PENDING); +} + +static BOOL DPNET_RecvPacket(DirectPlay8GlobalData *dp8gdData, void *pk, int pklen, IDirectPlay8Address *pAddr) +{ + LPBYTE hdr = pk; + DPNET_AsyncOp *aop = NULL; + HRESULT hr; + BOOL keep = FALSE; + + debug_hexdump(pk, pklen); + + if (pklen >= 2 && hdr[0] == DP8SESS_TAG) { + switch (hdr[1]) { + case DP8SESS_ENUM_REQUEST: + if (dp8gdData->is_host) { + DP8_EnumRequest *msg = pk; + GUID *guidApp = NULL; + int sz = sizeof(*msg); + if (msg->type == DP8SESS_ENUM_REQ_WITH_GUID) { guidApp = (LPVOID)(msg+1); sz += sizeof(GUID); } + if ((!guidApp) || IsEqualGUID(guidApp, &dp8gdData->appdesc.guidApplication)) { + DPNMSG_ENUM_HOSTS_QUERY resp; + memset(&resp, 0, sizeof(resp)); + resp.dwSize = sizeof(resp); + resp.pAddressSender = pAddr; + resp.pAddressDevice = NULL; /* FIXME */ + if (pklen > sz) { + resp.pvReceivedData = (LPVOID)(hdr + sz); + resp.dwReceivedDataSize = pklen - sz; + } + resp.dwMaxResponseDataSize = 0; /* FIXME */ + TRACE("dispatching EnumHosts query\n"); + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, DPN_MSGID_ENUM_HOSTS_QUERY, &resp); + TRACE("returned 0x%08x\n", hr); + if (hr != DPN_OK) break; + hr = DPNET_SendEnumResponse(dp8gdData, pAddr, msg->id, guidApp, + resp.pvResponseData, resp.dwResponseDataSize, + resp.pvResponseContext); + break; + } + } + /* we should probably send some reject packet? */ + TRACE("ignoring enum request since we're not hosting\n"); + break; + case DP8SESS_ENUM_RESPONSE: + { + DP8_EnumResponse *msg = pk; + DPNMSG_ENUM_HOSTS_RESPONSE resp; + DPN_APPLICATION_DESC desc; + + aop = DPNET_AsyncSearch(dp8gdData, DPN_MSGID_ENUM_HOSTS_RESPONSE, msg->id); + if (!aop) break; + memset(&resp, 0, sizeof(resp)); + resp.dwSize = sizeof(resp); + resp.pAddressSender = pAddr; + resp.pAddressDevice = aop->pAddrDev; + resp.pApplicationDescription = &desc; + resp.pvUserContext = aop->pvUserContext; + DPNET_ParseAppDesc(dp8gdData, &desc, &msg->app_desc, &msg->reply_ofs) + sizeof(*msg); + TRACE("session name: %s\n", debugstr_w(desc.pwszSessionName)); + TRACE("max players: %d, cur players: %d\n", desc.dwMaxPlayers, desc.dwCurrentPlayers); + if (msg->reply_size) { + resp.pvResponseData = ((LPBYTE)&msg->reply_ofs) + msg->reply_ofs; + resp.dwResponseDataSize = msg->reply_size; + } + TRACE("dispatching EnumHosts response\n"); + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, DPN_MSGID_ENUM_HOSTS_RESPONSE, &resp); + TRACE("returned 0x%08x\n", hr); + } + /* for now, we're going to assume that's it. */ + DPNET_AsyncRemove(dp8gdData, aop); + DPNET_AsyncSignal(dp8gdData, aop); + break; + default: + TRACE("unknown session packet 0 %d\n", hdr[1]); + } + } + else if (pklen >= 2) { + switch (hdr[0]) { + case DP8SESS_CONNECT: + { + DP8_Connect *msg = pk; + switch (msg->type) { + case DP8SESS_CONN_REQUEST: + if (dp8gdData->is_host) { + BOOL found; + dpPlayer *play = DPNET_MakePlayer(dp8gdData, pAddr, &found); + + DPNET_LockPlayer(dp8gdData, play); + if (!found) { + play->conn_id = msg->id; + play->ver = DP8SESS_MINVER(msg->ver, DP8SESS_DEFVER); + play->status = PLAYER_RESPONSE_SENT; + DPNET_SendConnectResponse(dp8gdData, play); + } + else if (play->status == PLAYER_RESPONSE_SENT) { + /* in case the first response was lost */ + DPNET_SendConnectResponse(dp8gdData, play); + } + DPNET_UnlockPlayer(dp8gdData, play); + break; + } + /* we should probably send some reject packet? */ + TRACE("ignoring connect request since we're not hosting\n"); + break; + case DP8SESS_CONN_RESPONSE: + { + dpPlayer *play = DPNET_FindPlayerByAddr(dp8gdData, pAddr); + + if (!play) { + TRACE("couldn't find connecting player\n"); + break; + } + + DPNET_LockPlayer(dp8gdData, play); + if (play->status == PLAYER_REQUEST_SENT) { + play->ver = DP8SESS_MINVER(msg->ver, DP8SESS_DEFVER); + play->status = PLAYER_CONNECTED; + TRACE("connected (ver %08x)\n", play->ver); + + DPNET_SendConnectAck(dp8gdData, play); + + if (play == dp8gdData->remoteHost) { + dp8gdData->localPlayer.status = PLAYER_CONNECTED; + DPNET_SendPlayerConnect(dp8gdData, play); + } + + /* DPNET_SendNoData(dp8gdData, play, 0x0, 0x0); */ + } + DPNET_UnlockPlayer(dp8gdData, play); + } + break; + default: + TRACE("unknown connect packet %d\n", msg->type); + } + } + break; + case DP8SESS_ACKNOWLEDGE: + { + DP8_ConnAck *msg = pk; + dpPlayer *play = DPNET_FindPlayerByAddr(dp8gdData, pAddr); + + if (!play) { + TRACE("couldn't find acknowledging player\n"); + break; + } + + switch (msg->type) { + case DP8SESS_ACK_CONNECT: + { + DPNET_LockPlayer(dp8gdData, play); + if (play->status == PLAYER_RESPONSE_SENT) { + TRACE("connected (ver %08x)\n", play->ver); + play->ver = msg->ver; + play->status = PLAYER_CONNECTED; + /* DPNET_SendNoData(dp8gdData, play, 0x0, 0x0); */ + } + DPNET_UnlockPlayer(dp8gdData, play); + } + break; + case DP8SESS_ACK_DATA_RELIABLE: + /* FIXME */ + break; + default: + TRACE("unknown acknowledge packet %d\n", msg->type); + } + } + break; + case DP8SESS_MESSAGE: + { + DP8_Message *msg = pk; + dpPlayer *play = DPNET_FindPlayerByAddr(dp8gdData, pAddr); + + if (!play) { + TRACE("couldn't find messaging player\n"); + break; + } + + DPNET_LockPlayer(dp8gdData, play); + + if (!DPNET_GotAck(dp8gdData, play, msg->next_out, msg->next_in)) { + TRACE("ignoring packet due to bad sequence\n"); + DPNET_UnlockPlayer(dp8gdData, play); + break; + } + + play->next_in++; + + DPNET_UnlockPlayer(dp8gdData, play); + + DPNET_RecvMessage(dp8gdData, pk, pklen, play); + } + break; + case DP8SESS_DATA_RELIABLE: + { + DP8_Data *msg = pk; + dpPlayer *play = DPNET_FindPlayerByAddr(dp8gdData, pAddr); + DWORD flags = 0; + + if (!play) { + TRACE("couldn't find messaging player\n"); + break; + } + + /* first empty data packet: */ + /* 3f 00 00 00 */ + /* acknowledge with: */ + /* 80 06 01 00 01 01 00 00 <timestamp> */ + + /* new empty data packet: */ + /* 3f 0a 02 02 */ + /* acknowledge with: */ + /* 80 06 03 00 02 01 00 00 <timestamp> 01 00 00 00 */ + + DPNET_LockPlayer(dp8gdData, play); + + if (!DPNET_GotAck(dp8gdData, play, msg->next_out, msg->next_in)) { + TRACE("ignoring packet due to bad sequence\n"); + DPNET_UnlockPlayer(dp8gdData, play); + break; + } + + play->next_in++; + + switch (msg->type) { + case 0x00: + DPNET_SendDataAck(dp8gdData, play); + flags |= DPNRECEIVE_GUARANTEED; + keep = DPNET_RecvData(dp8gdData, msg+1, pklen - sizeof(*msg), play, flags, (DPNHANDLE)pk); + break; + case 0x0a: + DPNET_SendDataAck2(dp8gdData, play); + keep = DPNET_RecvData(dp8gdData, msg+1, pklen - sizeof(*msg), play, flags, (DPNHANDLE)pk); + break; + } + + DPNET_UnlockPlayer(dp8gdData, play); + } + break; + default: + TRACE("unknown session packet %d\n", hdr[0]); + } + } + return keep; +} + +static HRESULT DPNET_SendPacket(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop) +{ + HRESULT hr; + + DPNET_AsyncInsert(dp8gdData, aop); + /* FIXME: enter into appropriate-priority queue first, + * network buffers may be full and other packets may have priority. */ + hr = IDirectPlay8ServiceProvider_SendTo(dp8gdData->sp, aop->pAddrHost, + &aop->PackBuffer, aop->cUserBuffer+1, 0); + if (hr == DPNERR_NOTREADY) { + /* once we've implemented queues, we should make the + * SP call us as soon as it's ready... (WSAEventSelect) */ + TRACE("transmit buffers full, must try again later!\n"); + } + + /* FIXME: only dispatch this when sent to all destinations, I think */ + if ((aop->dwType == DPN_MSGID_SEND_COMPLETE) && + !(aop->dwFlags & (DPNSEND_COMPLETEONPROCESS|DPNSEND_NOCOMPLETE))) { + DPNMSG_SEND_COMPLETE resp; + + memset(&resp, 0, sizeof(resp)); + resp.dwSize = sizeof(resp); + resp.hAsyncOp = (DPNHANDLE)aop; + resp.pvUserContext = aop->pvUserContext; + resp.hResultCode = hr; + resp.dwSendTime = GetTickCount() - aop->dwTimeSent; + resp.dwFirstFrameRTT = (DWORD)-1; + resp.dwFirstFrameRetryCount = (DWORD)-1; + resp.dwSendCompleteFlags = 0; + if (aop->dwFlags & DPNSEND_GUARANTEED) + resp.dwSendCompleteFlags |= DPNSENDCOMPLETE_GUARANTEED; + if (aop->cUserBuffer) { + resp.pBuffers = aop->UserBuffer; + resp.dwNumBuffers = aop->cUserBuffer; + } + TRACE("dispatching Send completion\n"); + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, DPN_MSGID_SEND_COMPLETE, &resp); + TRACE("returned\n"); + } + + /* FIXME: should only remove if the transmit was successful */ + if (aop->forget) { + DPNET_AsyncRemove(dp8gdData, aop); + DPNET_AsyncFree(dp8gdData, aop); + } + return S_OK; +} + +static HRESULT DPNET_StartAsync(DirectPlay8GlobalData *dp8gdData, DPNET_AsyncOp *aop) +{ +#ifdef FAKE_IT + HRESULT hr; + switch (aop->dwType) { + case DPN_MSGID_ENUM_HOSTS_RESPONSE: + { + static WCHAR sess_name[] = {'F','a','k','e',' ','S','e','s','s','i','o','n',0}; + static WCHAR host_name[] = {'1','2','7','.','0','.','0','.','1',0}; + DPNMSG_ENUM_HOSTS_RESPONSE resp; + DPN_APPLICATION_DESC desc; + IDirectPlay8AddressImpl *addrImpl = (IDirectPlay8AddressImpl *)aop->pAddrDev; + IDirectPlay8Address *addr = NULL; + + DPNET_CreateDirectPlay8Address(NULL, &IID_IDirectPlay8Address, (LPVOID*)&addr); + IDirectPlay8Address_SetSP(addr, &addrImpl->guidSP); + IDirectPlay8Address_AddComponent(addr, DPNA_KEY_HOSTNAME, host_name, sizeof(host_name)/sizeof(WCHAR), DPNA_DATATYPE_STRING); + + memset(&resp, 0, sizeof(resp)); + memset(&desc, 0, sizeof(desc)); + msg = (LPVOID)aop->PackBuffer.pBufferData; + resp.dwSize = sizeof(resp); + resp.pAddressSender = addr; + resp.pAddressDevice = aop->pAddrDev; + resp.pApplicationDescription = &desc; + resp.pvUserContext = aop->pvUserContext; + desc.dwSize = sizeof(desc); + memcpy(&desc.guidApplication, &dp8gdData->guidApplication, sizeof(GUID)); + desc.pwszSessionName = sess_name; + TRACE("dispatching fake EnumHosts response\n"); + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, aop->dwType, &resp); + TRACE("returned\n"); + IDirectPlay8Address_Release(addr); + } + break; + case DPN_MSGID_CONNECT_COMPLETE: + dp8gdData->localPlayer.dwPlayerID = 1; + { + DPNMSG_CONNECT_COMPLETE resp; + + memset(&resp, 0, sizeof(resp)); + resp.dwSize = sizeof(resp); + resp.hAsyncOp = (DPNHANDLE)aop; + resp.pvUserContext = aop->pvUserContext; + resp.hResultCode = S_OK; + resp.dpnidLocal = dp8gdData->localPlayer.dwPlayerID; + TRACE("dispatching fake Connect response\n"); + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, aop->dwType, &resp); + TRACE("returned\n"); + } + { + DPNMSG_CREATE_PLAYER resp; + + memset(&resp, 0, sizeof(resp)); + resp.dwSize = sizeof(resp); + resp.dpnidPlayer = 2; + resp.pvPlayerContext = NULL; + TRACE("dispatching fake remote CreatePlayer message\n"); + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, DPN_MSGID_CREATE_PLAYER, &resp); + dp8gdData->localPlayer.pvPlayerContext = resp.pvPlayerContext; + TRACE("returned\n"); + } + { + DPNMSG_CREATE_PLAYER resp; + + memset(&resp, 0, sizeof(resp)); + resp.dwSize = sizeof(resp); + resp.dpnidPlayer = dp8gdData->localPlayer.dwPlayerID; + resp.pvPlayerContext = dp8gdData->localPlayer.pvPlayerContext; + TRACE("dispatching fake local CreatePlayer message\n"); + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, DPN_MSGID_CREATE_PLAYER, &resp); + dp8gdData->localPlayer.pvPlayerContext = resp.pvPlayerContext; + TRACE("returned\n"); + } + break; + } + DPNET_AsyncSignal(dp8gdData, aop); +#else + HRESULT hr; + + hr = DPNET_SendPacket(dp8gdData, aop); + TRACE("transmit result: 0x%08x\n", hr); +#endif + + return S_OK; +} + +HRESULT DPNET_GetCaps(DirectPlay8GlobalData *dp8gdData, + DPN_CAPS *const pdpCaps, + const DWORD dwFlags) +{ + DWORD size = min(pdpCaps->dwSize, sizeof(dp8gdData->dpnCaps)); + memcpy(pdpCaps, &dp8gdData->dpnCaps, size); + return S_OK; +} + +HRESULT DPNET_GetSPCaps(DirectPlay8GlobalData *dp8gdData, + const GUID *const pguidSP, + DPN_SP_CAPS *const pdpnSPCaps, + const DWORD dwFlags) +{ + HRESULT hr; + hr = DPNET_InitSP(dp8gdData, pguidSP); + if (FAILED(hr)) return hr; + hr = IDirectPlay8ServiceProvider_GetSPCaps(dp8gdData->sp, pdpnSPCaps, dwFlags); + return hr; +} + +HRESULT DPNET_CancelAsyncOperation(DirectPlay8GlobalData *dp8gdData, + const DPNHANDLE hAsyncHandle, + const DWORD dwFlags) +{ + DPNET_AsyncOp *aop; + + if (!dwFlags) { + aop = (DPNET_AsyncOp *)hAsyncHandle; +#if 0 + DPNET_AsyncRemove(dp8gdData, aop); + DPNET_AsyncSignal(dp8gdData, aop); +#endif + } + + return S_OK; +} + +HRESULT DPNET_ReturnBuffer(DirectPlay8GlobalData *dp8gdData, + const DPNHANDLE hBufferHandle, + const DWORD dwFlags) +{ + HRESULT hr; + hr = IDirectPlay8ServiceProvider_ReturnBuffer(dp8gdData->sp, (void *)hBufferHandle, dwFlags); + return hr; +} + +HRESULT DPNET_GetApplicationDesc(DirectPlay8GlobalData *dp8gdData, + DPN_APPLICATION_DESC *const pAppDescBuffer, + DWORD *const pcbDataSize, + const DWORD dwFlags) +{ + EnterCriticalSection(&dp8gdData->cs_player); + + FIXME("return application desc\n"); + + LeaveCriticalSection(&dp8gdData->cs_player); + + return S_OK; +} + +HRESULT DPNET_SetPeerInfo(DirectPlay8GlobalData *dp8gdData, + const DPN_PLAYER_INFO *const pdpnPlayerInfo, + PVOID const pvAsyncContext, DPNHANDLE *const phAsyncHandle, + const DWORD dwFlags) +{ + dpPlayer *play = &dp8gdData->localPlayer; + + if (play->status != PLAYER_UNKNOWN) { + FIXME("change local info\n"); + return DPNSUCCESS_PENDING; + } + + DPNET_LockPlayer(dp8gdData, play); + + if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_NAME) { + if (play->name) HeapFree(GetProcessHeap(), 0, play->name); + play->name = NULL; + if (pdpnPlayerInfo->pwszName) { + DWORD l = (strlenW(pdpnPlayerInfo->pwszName)+1)*sizeof(WCHAR); + play->name = HeapAlloc(GetProcessHeap(), 0, l); + memcpy(play->name, pdpnPlayerInfo->pwszName, l); + } + } + + if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_DATA) { + if (play->data) HeapFree(GetProcessHeap(), 0, play->data); + play->data = NULL; + play->data_len = 0; + if (pdpnPlayerInfo->pvData && pdpnPlayerInfo->dwDataSize) { + play->data = HeapAlloc(GetProcessHeap(), 0, pdpnPlayerInfo->dwDataSize); + play->data_len = pdpnPlayerInfo->dwDataSize; + memcpy(play->data, pdpnPlayerInfo->pvData, pdpnPlayerInfo->dwDataSize); + } + } + + DPNET_UnlockPlayer(dp8gdData, play); + + return S_OK; +} + +HRESULT DPNET_GetPeerInfo(DirectPlay8GlobalData *dp8gdData, + const DPNID dpnid, + DPN_PLAYER_INFO *const pdpnPlayerInfo, + DWORD *const pdwSize, + const DWORD dwFlags) +{ + dpPlayer *play; + DWORD len; + + play = DPNET_FindPlayerByID(dp8gdData, dpnid); + if (!play) { + TRACE("player not found\n"); + return DPNERR_INVALIDPLAYER; + } + + DPNET_LockPlayer(dp8gdData, play); + + len = sizeof(DPN_PLAYER_INFO); + if (play->name) + len += (strlenW(play->name)+1)*sizeof(WCHAR); + if (play->data) + len += play->data_len; + + if (*pdwSize < len) { + *pdwSize = len; + DPNET_UnlockPlayer(dp8gdData, play); + return DPNERR_BUFFERTOOSMALL; + } + + if (pdpnPlayerInfo) { + LPBYTE ptr = (LPVOID)(pdpnPlayerInfo+1); + pdpnPlayerInfo->dwSize = sizeof(DPN_PLAYER_INFO); + pdpnPlayerInfo->dwInfoFlags = DPNINFO_NAME | DPNINFO_DATA; + pdpnPlayerInfo->dwPlayerFlags = 0; + if (play == &dp8gdData->localPlayer) { + pdpnPlayerInfo->dwPlayerFlags |= DPNPLAYER_LOCAL; + if (dp8gdData->is_host) + pdpnPlayerInfo->dwPlayerFlags |= DPNPLAYER_HOST; + } + if (play == dp8gdData->remoteHost) + pdpnPlayerInfo->dwPlayerFlags |= DPNPLAYER_HOST; + if (play->name) { + DWORD len = (strlenW(play->name)+1)*sizeof(WCHAR); + pdpnPlayerInfo->pwszName = (LPVOID)ptr; + memcpy(ptr, play->name, len); + ptr += len; + } else { + pdpnPlayerInfo->pwszName = NULL; + } + if (play->data) { + pdpnPlayerInfo->pvData = (LPVOID)ptr; + pdpnPlayerInfo->dwDataSize = play->data_len; + memcpy(ptr, play->data, play->data_len); + ptr += play->data_len; + } else { + pdpnPlayerInfo->pvData = NULL; + pdpnPlayerInfo->dwDataSize = 0; + } + } + + DPNET_UnlockPlayer(dp8gdData, play); + + return S_OK; +} + +HRESULT DPNET_GetPlayerContext(DirectPlay8GlobalData *dp8gdData, + const DPNID dpnid, + PVOID *const ppvPlayerContext, + const DWORD dwFlags) +{ + dpPlayer *play; + + play = DPNET_FindPlayerByID(dp8gdData, dpnid); + if (!play) { + TRACE("player not found\n"); + return DPNERR_INVALIDPLAYER; + } + + DPNET_LockPlayer(dp8gdData, play); + + /* FIXME: make sure CREATE_PLAYER is complete, + * return DPNERR_NOTREADY if not */ + + *ppvPlayerContext = play->pvPlayerContext; + + DPNET_UnlockPlayer(dp8gdData, play); + + return S_OK; +} + +HRESULT DPNET_EnumHosts(DirectPlay8GlobalData *dp8gdData, + PDPN_APPLICATION_DESC const pdnAppDesc, + IDirectPlay8Address *const pAddrHost, IDirectPlay8Address *const pDeviceInfo, + PVOID const pvUserEnumData, const DWORD dwUserEnumDataSize, + const DWORD dwEnumCount, const DWORD dwRetryInterval, + const DWORD dwTimeOut, PVOID const pvUserContext, + DPNHANDLE *const phAsyncHandle, const DWORD dwFlags) +{ + IDirectPlay8AddressImpl *addrImplDevice = (IDirectPlay8AddressImpl *)pDeviceInfo; + DPN_SP_CAPS dpnSPCaps; + DPNET_AsyncOp *aop; + DP8_EnumRequest *msg; + LPVOID msg_end; + BOOL has_guid; + + TRACE(" app dwFlags: 0x%08x\n", pdnAppDesc->dwFlags); + + DPNET_InitSP(dp8gdData, &addrImplDevice->guidSP); + + has_guid = !IsEqualGUID(&GUID_NULL, &pdnAppDesc->guidApplication); + + aop = DPNET_AsyncAlloc(dp8gdData, DPN_MSGID_ENUM_HOSTS_RESPONSE, sizeof(*msg) + has_guid*sizeof(GUID) + dwUserEnumDataSize); + aop->dwFlags = dwFlags; + aop->pvUserContext = pvUserContext; + if (pAddrHost) { + IDirectPlay8Address_AddRef(pAddrHost); + aop->pAddrHost = pAddrHost; + } + IDirectPlay8Address_AddRef(pDeviceInfo); + aop->pAddrDev = pDeviceInfo; + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->tag = DP8SESS_TAG; + msg->command = DP8SESS_ENUM_REQUEST; + msg->id = (DPNET_Random(dp8gdData) & 0xfff0) + 1; + msg->type = has_guid ? DP8SESS_ENUM_REQ_WITH_GUID : DP8SESS_ENUM_REQ_WITHOUT_GUID; + msg_end = msg+1; + + if (has_guid) { + memcpy(msg_end, &pdnAppDesc->guidApplication, sizeof(GUID)); + msg_end = ((GUID*)msg_end)+1; + } + + if (dwUserEnumDataSize) { + /* just copy to end of packet for now */ + memcpy(msg_end, pvUserEnumData, dwUserEnumDataSize); + } + + aop->dwID = msg->id; + + IDirectPlay8ServiceProvider_GetSPCaps(dp8gdData->sp, &dpnSPCaps, 0); + if (dwEnumCount) + aop->dwRetryLimit = dwEnumCount; + else + aop->dwRetryLimit = dpnSPCaps.dwDefaultEnumCount; + + if (dwRetryInterval) + aop->dwRetryInterval = dwRetryInterval; + else + aop->dwRetryInterval = dpnSPCaps.dwDefaultEnumRetryInterval; + + if (dwTimeOut) + aop->dwTimeOut = dwTimeOut; + else + aop->dwTimeOut = dpnSPCaps.dwDefaultEnumTimeout; + + if (dwFlags & DPNENUMHOSTS_SYNC) + DPNET_AsyncSetSync(dp8gdData, aop); + + DPNET_StartAsync(dp8gdData, aop); + + if (dwFlags & DPNENUMHOSTS_SYNC) { + DPNET_AsyncWait(dp8gdData, aop); + return DPNET_AsyncFree(dp8gdData, aop); + } else { + *phAsyncHandle = (DPNHANDLE)aop; + } + + return S_OK; +} + +HRESULT DPNET_Connect(DirectPlay8GlobalData *dp8gdData, + const DPN_APPLICATION_DESC *const pdnAppDesc, + IDirectPlay8Address *pAddrHost, + IDirectPlay8Address *pDeviceInfo, + const DPN_SECURITY_DESC * const pdnSecurity, + const DPN_SECURITY_CREDENTIALS *const pdnCredentials, + const void *const pvUserConnectData, + DWORD dwUserConnectDataSize, + void *pvPlayerContext, void *pvAsyncContext, + DPNHANDLE *phAsyncHandle, DWORD dwFlags) +{ + IDirectPlay8AddressImpl *addrImplDevice = (IDirectPlay8AddressImpl *)pDeviceInfo; + DPNET_AsyncOp *aop; + DP8_Connect *msg; + dpPlayer *play = &dp8gdData->localPlayer; + BOOL found; + + TRACE(" app dwFlags: 0x%08x\n", pdnAppDesc->dwFlags); + + DPNET_KillPlayers(dp8gdData); + + DPNET_SetAppDesc(dp8gdData, pdnAppDesc); + + DPNET_InitSP(dp8gdData, &addrImplDevice->guidSP); + + if (pdnSecurity || pdnCredentials) + FIXME("we dont support security stuff right now\n"); + + dp8gdData->pkt_id = 0; + + /* initialize local player */ + play->status = PLAYER_REQUEST_SENT; + play->pvPlayerContext = pvPlayerContext; + + if (dwUserConnectDataSize) { + play->conn_data = HeapAlloc(GetProcessHeap(), 0, dwUserConnectDataSize); + play->conn_data_len = dwUserConnectDataSize; + memcpy(play->conn_data, pvUserConnectData, dwUserConnectDataSize); + } + + /* initialize remote player (host) */ + play = DPNET_MakePlayer(dp8gdData, pAddrHost, &found); + dp8gdData->remoteHost = play; + play->status = PLAYER_REQUEST_SENT; + play->conn_id = DPNET_Random(dp8gdData); + + aop = DPNET_AsyncAlloc(dp8gdData, DPN_MSGID_CONNECT_COMPLETE, sizeof(*msg)); + aop->dwFlags = dwFlags; + aop->pvUserContext = pvAsyncContext; + if (pAddrHost) { + IDirectPlay8Address_AddRef(pAddrHost); + aop->pAddrHost = pAddrHost; + } + IDirectPlay8Address_AddRef(pDeviceInfo); + aop->pAddrDev = pDeviceInfo; + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + msg->command = DP8SESS_CONNECT; + msg->type = DP8SESS_CONN_REQUEST; + msg->pkt = 0; + msg->ver = DP8SESS_DEFVER; + msg->id = play->conn_id; + msg->time = GetTickCount(); + + aop->dwID = play->conn_id; + + aop->dwRetryLimit = dp8gdData->dpnCaps.dwConnectRetries; + aop->dwRetryInterval = dp8gdData->dpnCaps.dwConnectTimeout; + + if (dwFlags & DPNCONNECT_SYNC) + DPNET_AsyncSetSync(dp8gdData, aop); + + DPNET_StartAsync(dp8gdData, aop); + + if (dwFlags & DPNCONNECT_SYNC) { + DPNET_AsyncWait(dp8gdData, aop); + return DPNET_AsyncFree(dp8gdData, aop); + } else { + *phAsyncHandle = (DPNHANDLE)aop; + } + + return DPNSUCCESS_PENDING; +} + +HRESULT DPNET_Host(DirectPlay8GlobalData *dp8gdData, + const DPN_APPLICATION_DESC *const pdnAppDesc, + IDirectPlay8Address **const prgpDeviceInfo, + const DWORD cDeviceInfo, + const DPN_SECURITY_DESC * const pdnSecurity, + const DPN_SECURITY_CREDENTIALS *const pdnCredentials, + void *pvPlayerContext, + const DWORD dwFlags) +{ + IDirectPlay8AddressImpl *addrImplDevice = (IDirectPlay8AddressImpl *)prgpDeviceInfo[0]; + DPNMSG_CREATE_PLAYER resp; + dpPlayer *play = &dp8gdData->localPlayer; + HRESULT hr; + + TRACE(" app dwFlags: 0x%08x\n", pdnAppDesc->dwFlags); + + DPNET_KillPlayers(dp8gdData); + + DPNET_SetAppDesc(dp8gdData, pdnAppDesc); + + DPNET_InitSP(dp8gdData, &addrImplDevice->guidSP); + + if (pdnSecurity || pdnCredentials) + FIXME("we dont support security stuff right now\n"); + + dp8gdData->pkt_id = 0; + + dp8gdData->is_host = TRUE; + + /* initialize local player (host) */ + play->status = PLAYER_ACTIVE; + play->pvPlayerContext = pvPlayerContext; + + play->dwPlayerID = 1; /* FIRST POST!!!11!one! */ + dp8gdData->player_id = 2; + dp8gdData->appdesc.dwCurrentPlayers = 1; + + memset(&resp, 0, sizeof(resp)); + resp.dwSize = sizeof(resp); + resp.dpnidPlayer = play->dwPlayerID; + resp.pvPlayerContext = play->pvPlayerContext; + TRACE("dispatching local CreatePlayer message\n"); + hr = dp8gdData->pfMessageHandler(dp8gdData->pvUserContext, DPN_MSGID_CREATE_PLAYER, &resp); + dp8gdData->localPlayer.pvPlayerContext = resp.pvPlayerContext; + TRACE("returned\n"); + + return S_OK; +} + +/**** FIXME: move this and related stuff to a separate file (transport.c?) ****/ + +HRESULT DPNET_SendTo(DirectPlay8GlobalData *dp8gdData, const DPNID dpnid, + const DPN_BUFFER_DESC *const pBufferDesc, const DWORD cBufferDesc, + const DWORD dwTimeOut, void *pvAsyncContext, + DPNHANDLE *const phAsyncHandle, const DWORD dwFlags) +{ + DPNET_AsyncOp *aop; + DP8_Data *msg; + dpPlayer *play = NULL; + DWORD c, len; + + if (dpnid == DPNID_ALL_PLAYERS_GROUP) { + /* just sending to first player for now... */ + play = dp8gdData->remotePlayers; + /* FIXME: to be able to send to more than one player + * and still only submit SEND_COMPLETE once, we'll + * probably need to change the AsyncOp structure. */ + + if (!(dwFlags & DPNSEND_NOLOOPBACK)) { + FIXME("dispatch loopback RECEIVE\n"); + } + + if (!play) { + /* we're alone, talking to ourselves */ + FIXME("no receiver, should still dispatch SEND_COMPLETE\n"); + return S_OK; + } + } else { + play = DPNET_FindPlayerByID(dp8gdData, dpnid); + + if (!play) return DPNERR_INVALIDPLAYER; + } + + len = 0; + for (c=0; c<cBufferDesc; c++) + len += pBufferDesc[c].dwBufferSize; + + aop = DPNET_AsyncAlloc(dp8gdData, DPN_MSGID_SEND_COMPLETE, sizeof(*msg) + ((dwFlags & DPNSEND_NOCOPY) ? 0 : len)); + aop->dwFlags = dwFlags; + aop->pvUserContext = (PVOID)pvAsyncContext; + if (play) { + IDirectPlay8Address_AddRef(play->pAddress); + aop->pAddrHost = play->pAddress; + } + aop->pAddrDev = NULL; + + msg = (LPVOID)aop->PackBuffer.pBufferData; + + DPNET_LockPlayer(dp8gdData, play); + + msg->command = (dwFlags & DPNSEND_GUARANTEED) ? DP8SESS_DATA_RELIABLE : DP8SESS_DATA_UNRELIABLE; + msg->type = 0x0; + msg->next_out = play->next_out++; + msg->next_in = play->next_in; + play->ack_in = play->next_in; + + aop->dwTimeOut = dwTimeOut; + aop->dwTimeSent = GetTickCount(); + + if (dwFlags & DPNSEND_NOCOPY) { + aop->cUserBuffer = cBufferDesc; + memcpy(&aop->UserBuffer, pBufferDesc, sizeof(DPN_BUFFER_DESC)*cBufferDesc); + } else { + LPBYTE pk = (LPVOID)(msg+1); + for (c=0; c<cBufferDesc; c++) { + memcpy(pk, pBufferDesc[c].pBufferData, pBufferDesc[c].dwBufferSize); + pk += pBufferDesc[c].dwBufferSize; + } + } + + aop->dwID = msg->next_out; + aop->forget = TRUE; /* for now */ + + DPNET_UnlockPlayer(dp8gdData, play); + + if (dwFlags & DPNCONNECT_SYNC) + DPNET_AsyncSetSync(dp8gdData, aop); + + DPNET_StartAsync(dp8gdData, aop); + + if (dwFlags & DPNCONNECT_SYNC) { + DPNET_AsyncWait(dp8gdData, aop); + return DPNET_AsyncFree(dp8gdData, aop); + } else { + *phAsyncHandle = (DPNHANDLE)aop; + } + + return DPNSUCCESS_PENDING; +} diff --git a/dlls/dpnet/sp_tcpip.c b/dlls/dpnet/sp_tcpip.c new file mode 100644 index 0000000..24158be --- /dev/null +++ b/dlls/dpnet/sp_tcpip.c @@ -0,0 +1,613 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> +#include <stdio.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "winnls.h" +#include "objbase.h" +#include "wine/debug.h" +#include "winerror.h" +#include "winsock2.h" +#include "wine/unicode.h" + +#include "dplay8.h" +#include "dplobby8.h" +#include "dplay8_private.h" +#include "dplay8sp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + +static ICOM_VTABLE(IDirectPlay8ServiceProvider) directPlay8SP_TCPIPVT; + +void SP_TCPIP_ReleaseAddressData(PVOID data) +{ + HeapFree(GetProcessHeap(), 0, data); +} + +/* SHOULDNT NEED TO DUPLICATE. SHOULD USE URL */ +void SP_TCPIP_DuplicateAddressData(IDirectPlay8Address *pAddr, PVOID data) +{ + struct sockaddr_in *newData; + + newData = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sockaddr_in)); + + memcpy(newData, data, sizeof(struct sockaddr_in)); + DPNET_Address_SetSPData(pAddr, newData, SP_TCPIP_ReleaseAddressData, + SP_TCPIP_DuplicateAddressData); +} + +HRESULT WINAPI DirectPlay8SP_TCPIP_BuildAddressFromSPData(PDIRECTPLAY8SERVICEPROVIDER iface, + IDirectPlay8Address *pAddr, + PVOID pvSPData) +{ + /* ICOM_THIS(IDirectPlay8SP_TCPIPImpl, iface); */ + struct sockaddr_in *sin = pvSPData; + struct sockaddr_in *addrSPData; + char buf[16]; + WCHAR wbuf[16]; + DWORD port; + + TRACE("(%p)->(%p, %p)\n", iface, pAddr, pvSPData); + + /* FIXME: we could call IDirectPlay8AddressIP::BuildFromSockAddr, + * but it's not implemented yet */ + + /* FIXME: call getnameinfo() instead */ + sprintf(buf, "%d.%d.%d.%d", + sin->sin_addr.S_un.S_un_b.s_b1, + sin->sin_addr.S_un.S_un_b.s_b2, + sin->sin_addr.S_un.S_un_b.s_b3, + sin->sin_addr.S_un.S_un_b.s_b4); + MultiByteToWideChar(CP_ACP, 0, buf, -1, wbuf, 16); + port = ntohs(sin->sin_port); + + IDirectPlay8Address_Clear(pAddr); + IDirectPlay8Address_SetSP(pAddr, &CLSID_DP8SP_TCPIP); + IDirectPlay8Address_AddComponent(pAddr, DPNA_KEY_HOSTNAME, + wbuf, (strlenW(wbuf)+1)*sizeof(WCHAR), + DPNA_DATATYPE_STRING); + IDirectPlay8Address_AddComponent(pAddr, DPNA_KEY_PORT, + &port, sizeof(DWORD), + DPNA_DATATYPE_DWORD); + + addrSPData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct sockaddr_in)); + memcpy(addrSPData, pvSPData, sizeof(struct sockaddr_in)); + + DPNET_Address_SetSPData(pAddr, addrSPData, SP_TCPIP_ReleaseAddressData, + SP_TCPIP_DuplicateAddressData); + + return S_OK; +} + +static void SP_TCPIP_CallRead(void *pvIface, tpReadNode *node, DWORD sent) +{ + PDIRECTPLAY8SERVICEPROVIDER iface = pvIface; + ICOM_THIS(IDirectPlay8SP_TCPIPImpl, iface); + IDirectPlay8Address *pAddr = NULL; + IDirectPlay8Address *pUseAddr; + dpPlayer *play; + BOOL keep = FALSE; + + /* look for existing address object (from established connections) */ + EnterCriticalSection(&This->dp8gdData->cs_player); + play = This->dp8gdData->remotePlayers; + while (play) { + IDirectPlay8AddressImpl *addr = (IDirectPlay8AddressImpl *)play->pAddress; + if (IsEqualGUID(&addr->guidSP, &CLSID_DP8SP_TCPIP) && + !memcmp(addr->spData, node->Addr.pBufferData, node->Addr.dwBufferSize)) { + pAddr = play->pAddress; + IDirectPlay8Address_AddRef(pAddr); + break; + } + play = play->next; + } + LeaveCriticalSection(&This->dp8gdData->cs_player); + + pUseAddr = pAddr; + if (!pUseAddr) { + /* not found, build new one */ + DirectPlay8SP_TCPIP_BuildAddressFromSPData(iface, node->pAddr, node->Addr.pBufferData); + pUseAddr = node->pAddr; + } + + if (TRACE_ON(dplay)) { + BUFFERDESC buf; + buf.dwBufferSize = sent; + buf.pBufferData = node->Data.pBufferData; + DPNET_ParsePacket(IPPROTO_UDP, (LPVOID)node->Addr.pBufferData, NULL, &buf, 1); + /* debug_hexdump(node->Data.pBufferData, node->Data.dwBufferSize); */ + } + + if (This->msgCallback) { + keep = This->msgCallback(This->dp8gdData, node->Data.pBufferData, sent, pUseAddr); + } else { + TRACE("packet ignored\n"); + } + + if (pAddr) IDirectPlay8Address_Release(pAddr); + + node->Addr.dwBufferSize = sizeof(struct sockaddr_in); + if (keep) { + node->Data.pBufferData = HeapAlloc(GetProcessHeap(), 0, node->Data.dwBufferSize); + } +} + +static BOOL SP_TCPIP_InitRead(void *pvIface, tpReadNode *node) +{ + PDIRECTPLAY8SERVICEPROVIDER iface = pvIface; + ICOM_THIS(IDirectPlay8SP_TCPIPImpl, iface); + DWORD sent = 0; + DWORD flags = 0; + int res; + + TRACE("(%p, %p)\n", pvIface, node); + + memset(&node->ovl, 0, sizeof(node->ovl)); + node->ovl.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + if (!node->ovl.hEvent) { + TRACE("could not create event\n"); + return FALSE; + } + node->Addr.dwBufferSize = sizeof(struct sockaddr_in); + node->Addr.pBufferData = HeapAlloc(GetProcessHeap(), 0, node->Addr.dwBufferSize); + node->Data.dwBufferSize = This->dwMaxSize; + node->Data.pBufferData = HeapAlloc(GetProcessHeap(), 0, node->Data.dwBufferSize); + DPNET_CreateDirectPlay8Address(NULL, &IID_IDirectPlay8Address, (LPVOID*)&node->pAddr); + IDirectPlay8Address_SetSP(node->pAddr, &CLSID_DP8SP_TCPIP); + while (TRUE) { + /* request some data */ + res = WSARecvFrom(This->socket, (LPWSABUF)&node->Data, 1, &sent, &flags, + (LPVOID)node->Addr.pBufferData, (LPINT)&node->Addr.dwBufferSize, + &node->ovl, NULL); + if (res < 0) { + int err = WSAGetLastError(); + switch (err) { + case WSA_IO_PENDING: + TRACE("=> WSA_IO_PENDING\n"); + return TRUE; + default: + TRACE("=> WSA error %d\n", err); + return FALSE; + } + } + /* got some already, process it */ + SP_TCPIP_CallRead(pvIface, node, sent); + } +} + +static BOOL SP_TCPIP_CompRead(void *pvIface, tpReadNode *node) +{ + PDIRECTPLAY8SERVICEPROVIDER iface = pvIface; + ICOM_THIS(IDirectPlay8SP_TCPIPImpl, iface); + DWORD sent = 0; + DWORD flags = 0; + int res; + + TRACE("(%p, %p)\n", pvIface, node); + + if (!WSAGetOverlappedResult(This->socket, &node->ovl, &sent, FALSE, &flags)) { + int err = WSAGetLastError(); + TRACE("=> WSA error %d\n", err); + return FALSE; + } + + while (TRUE) { + /* process data */ + SP_TCPIP_CallRead(pvIface, node, sent); + /* request some more */ + res = WSARecvFrom(This->socket, (LPWSABUF)&node->Data, 1, &sent, &flags, + (LPVOID)node->Addr.pBufferData, (LPINT)&node->Addr.dwBufferSize, + &node->ovl, NULL); + if (res < 0) { + int err = WSAGetLastError(); + switch (err) { + case WSA_IO_PENDING: + TRACE("=> WSA_IO_PENDING\n"); + return TRUE; + default: + TRACE("=> WSA error %d\n", err); + return FALSE; + } + } + } +} + +HRESULT WINAPI +DirectPlay8SP_TCPIP_ReturnBuffer(PDIRECTPLAY8SERVICEPROVIDER iface, + void *pk, DWORD dwFlags) +{ + /* ICOM_THIS(IDirectPlay8SP_TCPIPImpl, iface); */ + HeapFree(GetProcessHeap(), 0, pk); + return S_OK; +} + +HRESULT WINAPI +DirectPlay8SP_TCPIP_QueryInterface(PDIRECTPLAY8SERVICEPROVIDER iface, + REFIID riid, LPVOID *obj) +{ + ICOM_THIS(IDirectPlay8SP_TCPIPImpl, iface); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IDirectPlay8ServiceProvider, riid)) + { + This->ref++; + *obj = This; + return S_OK; + } + else + { + FIXME("(%p)->(%s, %p): no interface\n", iface, debugstr_guid(riid), obj); + return E_NOINTERFACE; + } +} + +ULONG WINAPI +DirectPlay8SP_TCPIP_AddRef(PDIRECTPLAY8SERVICEPROVIDER iface) +{ + ICOM_THIS(IDirectPlay8SP_TCPIPImpl, iface); + TRACE("(%p)->()\n", iface); + return ++This->ref; +} + +ULONG WINAPI +DirectPlay8SP_TCPIP_Release(PDIRECTPLAY8SERVICEPROVIDER iface) +{ + ICOM_THIS(IDirectPlay8SP_TCPIPImpl, iface); + TRACE("(%p)->()\n", iface); + if (--This->ref) return This->ref; + + FIXME("destroy this and everything\n"); + closesocket(This->socket); + + if (This->threadPool) + IDirectPlay8ThreadPool_Release(This->threadPool); + + HeapFree(GetProcessHeap(), 0, This); + return 0; +} + +HRESULT WINAPI +DirectPlay8SP_TCPIP_Initialize(PDIRECTPLAY8SERVICEPROVIDER iface, + DirectPlay8GlobalData *dp8gdData, + spMessageReceived msgCallback, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8SP_TCPIPImpl, iface); + HRESULT hr; + struct sockaddr_in bind_sin; + int bind_err, port; + + WORD version = MAKEWORD(2, 2); + WSADATA wsaData; + + /* fixme: error checking, and much more */ + TRACE("(%p)->(%p, %p, 0x%08x)\n", iface, dp8gdData, msgCallback, dwFlags); + + This->dpnSPCaps.dwFlags = DPNSPCAPS_SUPPORTSALLADAPTERS; + This->dpnSPCaps.dwNumThreads = 4; /* windows: 3 */ + This->dpnSPCaps.dwDefaultEnumCount = 5; + This->dpnSPCaps.dwDefaultEnumRetryInterval = 1500; + This->dpnSPCaps.dwDefaultEnumTimeout = 1500; + This->dpnSPCaps.dwMaxEnumPayloadSize = 0; /* windows: 983 */ + This->dpnSPCaps.dwBuffersPerThread = 0; /* windows: 1 */ + This->dpnSPCaps.dwSystemBufferSize = 0; /* windows: 8192 */ + + + This->dp8gdData = dp8gdData; + This->msgCallback = msgCallback; + + WSAStartup(version, &wsaData); + This->dwMaxSize = wsaData.iMaxUdpDg; + This->socket = socket(AF_INET, SOCK_DGRAM, 0); + + TRACE("got socket: %p\n", This->socket); + + port = 2302; + do + { + bind_sin.sin_port = htons(2302); + bind_sin.sin_family = AF_INET; + bind_sin.sin_addr.s_addr = INADDR_ANY; + bind_err = bind(This->socket, (struct sockaddr *)&bind_sin, sizeof(bind_sin)); + port++; + } while (bind_err < 0 && port < 2400); + if (bind_err < 0) + FIXME("couldn't bind to a port, something could go wrong, maybe...\n"); + + hr = DPNET_GetThreadPool(&This->threadPool, This->dpnSPCaps.dwNumThreads); + if (FAILED(hr)) { + ERR("couldn't initialize thread pool: 0x%08x\n", hr); + return hr; + } + DPNET_InitAsyncRead(This->threadPool, SP_TCPIP_InitRead, SP_TCPIP_CompRead, This); + + return S_OK; +} + +static HRESULT SP_TCPIP_SetAddrDataFromHostname(PDIRECTPLAY8ADDRESS dp8Address, + WCHAR *pHostName, DWORD port) +{ + char *ahostname, *portpos; + int lenhostname; + struct sockaddr_in *addrSPData; + + TRACE("(%p, %s)\n", dp8Address, debugstr_w(pHostName)); + + lenhostname = strlenW(pHostName)+1; + ahostname = (CHAR *)HeapAlloc(GetProcessHeap(), 0, lenhostname * sizeof(char)); + WideCharToMultiByte(CP_ACP, -1, pHostName, -1, ahostname, lenhostname, + NULL, NULL); + if ((portpos = strchr(ahostname, ':'))) + { + *portpos = '\0'; + portpos += 1; + FIXME("support custom ports in hostname\n"); + } + if (!port) port = 2302; + + addrSPData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct sockaddr_in)); + addrSPData->sin_port = htons(port); + addrSPData->sin_family = AF_INET; + + if ((addrSPData->sin_addr.s_addr = inet_addr(ahostname)) == INADDR_NONE) + { + struct hostent *host_ip; + if (!(host_ip = gethostbyname(ahostname)) || !host_ip->h_addr_list[0]) + { + ERR("host name invalid. what do we do??\n"); + return E_FAIL; + } + + addrSPData->sin_addr.s_addr = inet_addr(host_ip->h_addr_list[0]); + } + HeapFree(GetProcessHeap(), 0, ahostname); + DPNET_Address_SetSPData(dp8Address, addrSPData, SP_TCPIP_ReleaseAddressData, + SP_TCPIP_DuplicateAddressData); + return S_OK; +} + +/* no. this isn't quite right. We need a packet window like thing - and that thread should + * prompt for the address. Currently multiple threads can try to send things at once, + * this causes a problem in that multiple dialogs could come up at once. + * We get around this by grabbing a lock before testing the service provider. + * it is a HACK (David, 23/01/03) - but until we get some better packet management, it will + * have to do + */ +static HRESULT SP_TCPIP_GetSockAddress(PDIRECTPLAY8ADDRESS dp8Address, + struct sockaddr_in *sin) +{ + struct sockaddr_in *addrSPData; + + TRACE("(%p, %p)\n", dp8Address, sin); + + DPNET_Address_GetDialogLock(dp8Address); + DPNET_Address_GetSPData(dp8Address, (void **)&addrSPData); + if (!addrSPData) + { /* FIXME: all this should probably be somewhere else.. */ + WCHAR *hostname = NULL; + DWORD size = 0; + DWORD type = 0; + DWORD port = 0; + + if (IDirectPlay8Address_GetComponentByName(dp8Address, DPNA_KEY_HOSTNAME, + NULL, &size, &type) == DPNERR_BUFFERTOOSMALL + && size != 0) + { + DWORD portsize = sizeof(DWORD); + hostname = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR) * size); + IDirectPlay8Address_GetComponentByName(dp8Address, DPNA_KEY_HOSTNAME, + hostname, &size, &type); + /* type should be DPNA_DATATYPE_STRING*/ + + if (IDirectPlay8Address_GetComponentByName(dp8Address, DPNA_KEY_PORT, + &port, &portsize, &type) != S_OK) + port = 0; + } + else /* need to prompt for hostname */ + { + DPNET_HostNameShowDialog(&hostname); + + if (!hostname) + { + WARN("no host name specified\n"); + DPNET_Address_ReleaseDialogLock(dp8Address); + return E_FAIL; + } + TRACE("hostname from dialog: %s\n", debugstr_w(hostname)); + } + + if (FAILED(SP_TCPIP_SetAddrDataFromHostname(dp8Address, hostname, port))) + { + if (size) + HeapFree(GetProcessHeap(), 0, hostname); + DPNET_Address_ReleaseDialogLock(dp8Address); + return E_FAIL; + } + DPNET_Address_GetSPData(dp8Address, (void **)&addrSPData); + + if (size) + { + HeapFree(GetProcessHeap(), 0, hostname); + } + else + { + DPNET_HostNameFree(hostname); + } + } + memcpy(sin, addrSPData, sizeof(struct sockaddr_in)); + DPNET_Address_ReleaseDialogLock(dp8Address); + + return S_OK; +} + +HRESULT WINAPI DirectPlay8SP_TCPIP_SendTo(PDIRECTPLAY8SERVICEPROVIDER iface, + IDirectPlay8Address *pAddrDest, + const DPN_BUFFER_DESC *prgBufferDesc, + const DWORD cBufferDesc, + DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8SP_TCPIPImpl, iface); + struct sockaddr_in sin; + DWORD sent = 0; + HRESULT hr; + int res; + + TRACE("(%p)->(%p, %p, %i, %08x)\n", iface, pAddrDest, prgBufferDesc, cBufferDesc, dwFlags); + + hr = SP_TCPIP_GetSockAddress(pAddrDest, &sin); + if (hr != S_OK) + return hr; + + if (TRACE_ON(dplay)) { + DWORD c; + DPNET_ParsePacket(IPPROTO_UDP, NULL, &sin, prgBufferDesc, cBufferDesc); + for (c=0; c<cBufferDesc; c++) { + debug_hexdump(prgBufferDesc[c].pBufferData, prgBufferDesc[c].dwBufferSize); + } + } + + res = WSASendTo(This->socket, (LPWSABUF)prgBufferDesc, cBufferDesc, + &sent, 0, (LPVOID)&sin, sizeof(sin), NULL, NULL); + if (res < 0) { + int err = WSAGetLastError(); + switch (err) { + case WSAEWOULDBLOCK: + TRACE("=> WSAEWOULDBLOCK\n"); + return DPNERR_NOTREADY; + default: + TRACE("=> WSA error %d\n", err); + return DPNERR_GENERIC; + } + } else { + TRACE("sent %d bytes\n", sent); + return DPN_OK; + } +} + +HRESULT WINAPI DirectPlay8SP_TCPIP_GetSPCaps(PDIRECTPLAY8SERVICEPROVIDER iface, + DPN_SP_CAPS *pdpnSPCaps, + DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8SP_TCPIPImpl, iface); + + TRACE("(%p)->(%p, 0x%08x)\n", iface, pdpnSPCaps, dwFlags); + pdpnSPCaps->dwFlags = This->dpnSPCaps.dwFlags; + pdpnSPCaps->dwNumThreads = This->dpnSPCaps.dwNumThreads; + pdpnSPCaps->dwDefaultEnumCount = This->dpnSPCaps.dwDefaultEnumCount; + pdpnSPCaps->dwDefaultEnumRetryInterval = This->dpnSPCaps.dwDefaultEnumRetryInterval; + pdpnSPCaps->dwDefaultEnumTimeout = This->dpnSPCaps.dwDefaultEnumTimeout; + pdpnSPCaps->dwMaxEnumPayloadSize = This->dpnSPCaps.dwMaxEnumPayloadSize; + pdpnSPCaps->dwBuffersPerThread = This->dpnSPCaps.dwBuffersPerThread; + pdpnSPCaps->dwSystemBufferSize = This->dpnSPCaps.dwSystemBufferSize; + + return S_OK; +} + +HRESULT WINAPI DirectPlay8SP_TCPIP_SetSPAddressData(PDIRECTPLAY8SERVICEPROVIDER iface, + IDirectPlay8Address *pAddr) +{ +/* ICOM_THIS(IDirectPlay8SP_TCPIPImpl, iface); */ + WCHAR *hostname = NULL; + DWORD port = 0; + WCHAR port_str[20]; /* enough for a DWORD (port) */ + + WCHAR *fullHostname, *p; + + DWORD bufferLen = 0; + DWORD data_type = 0; + HRESULT hr; + + TRACE("(%p)->(%p)\n", iface, pAddr); + + /* get hostname */ + hr = IDirectPlay8Address_GetComponentByName(pAddr, DPNA_KEY_HOSTNAME, + NULL, &bufferLen, &data_type); + if (hr != DPNERR_BUFFERTOOSMALL) return hr; + if (data_type != DPNA_DATATYPE_STRING) + ERR("wrong data type for host name\n"); + hostname = HeapAlloc(GetProcessHeap(), 0, bufferLen * sizeof(WCHAR)); + IDirectPlay8Address_GetComponentByName(pAddr, DPNA_KEY_HOSTNAME, + hostname, &bufferLen, &data_type); + + /* get port */ + bufferLen = 0; + hr = IDirectPlay8Address_GetComponentByName(pAddr, DPNA_KEY_PORT, + &port, &bufferLen, &data_type); + if (SUCCEEDED(hr) && data_type == DPNA_DATATYPE_DWORD) + { + const WCHAR fmt[] = {'%', 'l', 'd', 0}; + wsprintfW(port_str, fmt, port); + } + else if (hr != DPNERR_DOESNOTEXIST) + ERR("failed due to some other reason (bad)\n"); + + bufferLen = strlenW(hostname) + (port ? strlenW(port_str) : 0) + 2; + + fullHostname = HeapAlloc(GetProcessHeap(), 0, bufferLen * sizeof(WCHAR)); + strcpyW(fullHostname, hostname); + p = fullHostname + strlenW(hostname); + *p = (WCHAR) ':'; + p++; + if (port) strcpyW(p, port_str); + TRACE("full host name from address: %s\n", debugstr_w(fullHostname)); + + SP_TCPIP_SetAddrDataFromHostname(pAddr, fullHostname, 0); + HeapFree(GetProcessHeap(), 0, hostname); + HeapFree(GetProcessHeap(), 0, fullHostname); + return S_OK; +} + +static ICOM_VTABLE(IDirectPlay8ServiceProvider) directPlay8SP_TCPIPVT = +{ + DirectPlay8SP_TCPIP_QueryInterface, + DirectPlay8SP_TCPIP_AddRef, + DirectPlay8SP_TCPIP_Release, + DirectPlay8SP_TCPIP_Initialize, + DirectPlay8SP_TCPIP_SendTo, + (void*)0xdead1055, + DirectPlay8SP_TCPIP_GetSPCaps, + DirectPlay8SP_TCPIP_SetSPAddressData, + DirectPlay8SP_TCPIP_BuildAddressFromSPData, + DirectPlay8SP_TCPIP_ReturnBuffer +}; + +HRESULT DPNET_CreateDirectPlay8SP_TCPIP(IUnknown *pOuter, REFIID riid, LPVOID *ppobj) +{ + IDirectPlay8SP_TCPIPImpl *ipDP8SP_TCPIP; + HRESULT hr; + TRACE("()\n"); + ipDP8SP_TCPIP = (IDirectPlay8SP_TCPIPImpl *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(IDirectPlay8SP_TCPIPImpl)); + if (ipDP8SP_TCPIP == NULL) return E_OUTOFMEMORY; + ICOM_VTBL(ipDP8SP_TCPIP) = &directPlay8SP_TCPIPVT; + DirectPlay8SP_TCPIP_AddRef((IDirectPlay8ServiceProvider *)ipDP8SP_TCPIP); + TRACE("Created new object: %p\n", ipDP8SP_TCPIP); + hr = DirectPlay8SP_TCPIP_QueryInterface((IDirectPlay8ServiceProvider *)ipDP8SP_TCPIP, riid, ppobj); + DirectPlay8SP_TCPIP_Release((IDirectPlay8ServiceProvider *)ipDP8SP_TCPIP); + if (SUCCEEDED(hr)) + return S_OK; + else + return E_NOINTERFACE; +} diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c new file mode 100644 index 0000000..5656664 --- /dev/null +++ b/dlls/dpnet/threadpool.c @@ -0,0 +1,407 @@ +/* dpnet.dll + * + * Copyright (C) 2002-2007 TransGaming Inc. + * Written by: David Hammerton, Ove Kåven + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" +#include "wine/debug.h" +#include "winerror.h" +#include "winsock2.h" + +#include "dplay8.h" +#include "dplobby8.h" +#include "dplay8_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + +static ICOM_VTABLE(IDirectPlay8ThreadPool) directPlay8ThreadPoolVT; + +static IDirectPlay8ThreadPoolImpl *pThreadPool; + +static void DPNET_UpdateTimer(IDirectPlay8ThreadPoolImpl *This) +{ + EnterCriticalSection(&This->cs_timer); + CancelWaitableTimer(This->hTimer); + /* FIXME */ + LeaveCriticalSection(&This->cs_timer); +} + +static DWORD CALLBACK DPNET_ThreadProc(LPVOID arg) +{ + IDirectPlay8ThreadPoolImpl *This = pThreadPool; + tpThreadNode *node = arg; + HANDLE hTimer = This->hTimer; + HANDLE *objs = NULL; + DWORD count = 0, res; + BOOL recount = TRUE; + + EnterCriticalSection(&node->cs); + node->dwID = GetCurrentThreadId(); + + for (;;) { + tpReadNode *rnode; + + if (recount) { + /* init and count objects */ + count = 2; + rnode = node->Read; + while (rnode) { + /* not-so-elegant way of calling init routine once... */ + if (rnode->pfnInit) { + rnode->pfnInit(rnode->ctx, rnode); + rnode->pfnInit = NULL; + } + if (rnode->ovl.hEvent) count++; + rnode = rnode->next; + } + /* make array of objects */ + objs = HeapReAlloc(GetProcessHeap(), 0, objs, count*sizeof(HANDLE)); + objs[0] = node->hJob; + objs[1] = hTimer; + count = 2; + rnode = node->Read; + while (rnode) { + if (rnode->ovl.hEvent) objs[count++] = rnode->ovl.hEvent; + rnode = rnode->next; + } + recount = FALSE; + } + LeaveCriticalSection(&node->cs); + + /* start waiting */ + res = WaitForMultipleObjects(count, objs, FALSE, INFINITE); + + EnterCriticalSection(&node->cs); + + if (res == WAIT_OBJECT_0) { + if (node->die_please) break; + recount = TRUE; + } + else if (res == WAIT_OBJECT_0+1) { + /* FIXME: check timeouts */ + DPNET_UpdateTimer(This); + } + else if (res == WAIT_FAILED) { + ERR("wait failed\n"); + } + else { + HANDLE hObj = objs[res - WAIT_OBJECT_0]; + /* find which object got it */ + rnode = node->Read; + while (rnode) { + if (rnode->ovl.hEvent == hObj) break; + rnode = rnode->next; + } + if (rnode) { + /* ah hah */ + rnode->pfnRead(rnode->ctx, rnode); + } + else { + ERR("failed to locate object for handle %p\n", hObj); + } + } + } + + /* cleanup */ + while (node->Read) { + tpReadNode *rnode = node->Read; + node->Read = rnode->next; + if (rnode->ovl.hEvent) CloseHandle(rnode->ovl.hEvent); + if (rnode->Addr.pBufferData) HeapFree(GetProcessHeap(), 0, rnode->Addr.pBufferData); + if (rnode->Data.pBufferData) HeapFree(GetProcessHeap(), 0, rnode->Data.pBufferData); + if (rnode->pAddr) IDirectPlay8Address_Release(rnode->pAddr); + HeapFree(GetProcessHeap(), 0, rnode); + } + LeaveCriticalSection(&node->cs); + return 0; +} + +static void DPNET_StartThreads(IDirectPlay8ThreadPool *iface) +{ + ICOM_THIS(IDirectPlay8ThreadPoolImpl, iface); + EnterCriticalSection(&This->cs_thread); + if (This == pThreadPool) { + while (This->dwCurThreads < This->dwNumThreads) { + tpThreadNode *node = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(tpThreadNode)); + InitializeCriticalSection(&node->cs); + node->hJob = CreateEventA(NULL, FALSE, FALSE, NULL); + node->next = This->threads; + if (node->next) node->next->prev = node; + This->threads = node; + node->hThread = CreateThread(NULL, 0, DPNET_ThreadProc, node, 0, NULL); + This->dwCurThreads++; + } + } + LeaveCriticalSection(&This->cs_thread); + DPNET_UpdateTimer(This); +} + +static void DPNET_StopThreads(IDirectPlay8ThreadPool *iface) +{ + ICOM_THIS(IDirectPlay8ThreadPoolImpl, iface); + EnterCriticalSection(&This->cs_thread); + if (This == pThreadPool) { + while (This->dwCurThreads) { + tpThreadNode *node = This->threads; + node->die_please = TRUE; + SetEvent(node->hJob); + WaitForSingleObject(node->hThread, INFINITE); + This->threads = node->next; + CloseHandle(node->hThread); + CloseHandle(node->hJob); + DeleteCriticalSection(&node->cs); + HeapFree(GetProcessHeap(), 0, node); + This->dwCurThreads--; + } + } + CancelWaitableTimer(This->hTimer); + LeaveCriticalSection(&This->cs_thread); +} + +/* IDirectPlay8ThreadPool */ +HRESULT WINAPI +DirectPlay8ThreadPool_QueryInterface(PDIRECTPLAY8THREADPOOL iface, + REFIID riid, LPVOID *obj) +{ + ICOM_THIS(IDirectPlay8ThreadPoolImpl, iface); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IDirectPlay8ThreadPool, riid)) + { + This->ref++; + *obj = This; + return S_OK; + } +#if 0 + else if (IsEqualGUID(&IID_IDirectPlay8ThreadPool_Internal, riid)) + { + This->ref++; + *obj = (LPVOID *)&This->lpVtbl2; + return S_OK; + } +#endif + else + { + FIXME("(%p)->(%s, %p): no interface\n", iface, debugstr_guid(riid), obj); + return E_NOINTERFACE; + } +} + +ULONG WINAPI +DirectPlay8ThreadPool_AddRef(PDIRECTPLAY8THREADPOOL iface) +{ + ICOM_THIS(IDirectPlay8ThreadPoolImpl, iface); + TRACE("(%p)->()\n", iface); + return ++This->ref; +} + +ULONG WINAPI +DirectPlay8ThreadPool_Release(PDIRECTPLAY8THREADPOOL iface) +{ + ICOM_THIS(IDirectPlay8ThreadPoolImpl, iface); + TRACE("(%p)->()\n", iface); + if (--This->ref) return This->ref; + + IDirectPlay8ThreadPool_Close(iface, 0); + + CloseHandle(This->hTimer); + DeleteCriticalSection(&This->cs_timer); + DeleteCriticalSection(&This->cs_thread); + HeapFree(GetProcessHeap(), 0, This); + return 0; +} + +HRESULT WINAPI +DirectPlay8ThreadPool_Initialize(PDIRECTPLAY8THREADPOOL iface, + PVOID const pvUserContext, + const PFNDPNMESSAGEHANDLER pfn, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8ThreadPoolImpl, iface); + TRACE("(%p)->(%p, %p, %08x): stub\n", iface, pvUserContext, pfn, dwFlags); + if (pThreadPool) { + /* we should return DPNERR_NOTALLOWED if it was + * initialized by another dplay object? */ + TRACE("=> already initialized\n"); + return DPNERR_ALREADYINITIALIZED; + } + This->pfn = pfn; + This->pvUserContext = pvUserContext; + pThreadPool = This; + return S_OK; +} + +HRESULT WINAPI +DirectPlay8ThreadPool_Close(PDIRECTPLAY8THREADPOOL iface, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8ThreadPoolImpl, iface); + FIXME("(%p)->(%08x): stub\n", iface, dwFlags); + if (pThreadPool != This) { + TRACE("=> not initialized\n"); + return DPNERR_UNINITIALIZED; + } + DPNET_StopThreads(iface); + if (pThreadPool == This) + pThreadPool = NULL; + return S_OK; +} + +HRESULT WINAPI +DirectPlay8ThreadPool_GetThreadCount(PDIRECTPLAY8THREADPOOL iface, + const DWORD dwProcessorNum, + DWORD *const pdwNumThreads, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8ThreadPoolImpl, iface); + FIXME("(%p)->(%08i, %p, %08x): semi-stub\n", + iface, dwProcessorNum, pdwNumThreads, dwFlags); + if (pThreadPool != This) { + TRACE("=> not initialized\n"); + return DPNERR_UNINITIALIZED; + } + *pdwNumThreads = This->dwNumThreads; + return S_OK; +} + +HRESULT WINAPI +DirectPlay8ThreadPool_SetThreadCount(PDIRECTPLAY8THREADPOOL iface, + const DWORD dwProcessorNum, + const DWORD dwNumThreads, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8ThreadPoolImpl, iface); + FIXME("(%p)->(%08i, %08i, %08x): semi-stub\n", + iface, dwProcessorNum, dwNumThreads, dwFlags); + if (pThreadPool != This) { + TRACE("=> not initialized\n"); + return DPNERR_UNINITIALIZED; + } + This->dwNumThreads = dwNumThreads; + DPNET_StartThreads(iface); + return S_OK; +} + +HRESULT WINAPI +DirectPlay8ThreadPool_DoWork(PDIRECTPLAY8THREADPOOL iface, + const DWORD dwAllowedTimeSlice, + const DWORD dwFlags) +{ + ICOM_THIS(IDirectPlay8ThreadPoolImpl, iface); + FIXME("(%p)->(%08i, %08x): stub (if they are using this expect badness, app may not be thread safe when we need it to be)\n", + iface, dwAllowedTimeSlice, dwFlags); + if (pThreadPool != This) { + TRACE("=> not initialized\n"); + return DPNERR_UNINITIALIZED; + } + return S_OK; +} + +static ICOM_VTABLE(IDirectPlay8ThreadPool) directPlay8ThreadPoolVT = +{ + DirectPlay8ThreadPool_QueryInterface, + DirectPlay8ThreadPool_AddRef, + DirectPlay8ThreadPool_Release, + DirectPlay8ThreadPool_Initialize, + DirectPlay8ThreadPool_Close, + DirectPlay8ThreadPool_GetThreadCount, + DirectPlay8ThreadPool_SetThreadCount, + DirectPlay8ThreadPool_DoWork +}; + +HRESULT DPNET_CreateDirectPlay8ThreadPool(IUnknown *pOuter, REFIID riid, LPVOID *ppobj) +{ + IDirectPlay8ThreadPoolImpl *ipDP8TP; + HRESULT hr; + TRACE("()\n"); + ipDP8TP = (IDirectPlay8ThreadPoolImpl *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(IDirectPlay8ThreadPoolImpl)); + if (ipDP8TP == NULL) return E_OUTOFMEMORY; + ICOM_VTBL(ipDP8TP) = &directPlay8ThreadPoolVT; +#if 0 + ipDP8TP->lpVtbl2 = &directPlay8ThreadPool_InternalVT; +#endif + InitializeCriticalSection(&ipDP8TP->cs_thread); + InitializeCriticalSection(&ipDP8TP->cs_timer); + ipDP8TP->hTimer = CreateWaitableTimerA(NULL, FALSE, NULL); + IDirectPlay8ThreadPool_AddRef((PDIRECTPLAY8THREADPOOL)ipDP8TP); + TRACE("Created new object: %p\n", ipDP8TP); + hr = IDirectPlay8ThreadPool_QueryInterface((PDIRECTPLAY8THREADPOOL)ipDP8TP, riid, ppobj); + IDirectPlay8ThreadPool_Release((PDIRECTPLAY8THREADPOOL)ipDP8TP); + if (SUCCEEDED(hr)) + return S_OK; + else + return E_NOINTERFACE; +} + +HRESULT DPNET_GetThreadPool(IDirectPlay8ThreadPool **ppThreadPool, DWORD dwNumThreads) +{ + IDirectPlay8ThreadPool* pTP; + if (!pThreadPool) { + /* thread pool does not exist, create one */ + HRESULT hr = DPNET_CreateDirectPlay8ThreadPool(NULL, &IID_IDirectPlay8ThreadPool, (LPVOID*)&pTP); + if (FAILED(hr)) + return hr; + hr = IDirectPlay8ThreadPool_Initialize(pTP, NULL, NULL, 0); + if (SUCCEEDED(hr)) + hr = IDirectPlay8ThreadPool_SetThreadCount(pTP, -1, dwNumThreads, 0); + if (SUCCEEDED(hr)) { + *ppThreadPool = pTP; + return S_OK; + } + IDirectPlay8ThreadPool_Release(pTP); + return hr; + } else { + /* thread pool already exist */ + pTP = (LPVOID)pThreadPool; + *ppThreadPool = pTP; + IDirectPlay8ThreadPool_AddRef(pTP); + return S_OK; + } +} + +/* This schedules async reads on *all* threads, so that multiple incoming packets + * can be processed in parallel. I think real dplay distributes its connections + * across the available threads to avoid overloading any of them, but I doubt we're + * going to have many enough connections for that to be an issue. */ +void DPNET_InitAsyncRead(IDirectPlay8ThreadPool *iface, tpInitFunc pfnInit, tpReadFunc pfnRead, void *data) +{ + ICOM_THIS(IDirectPlay8ThreadPoolImpl, iface); + EnterCriticalSection(&This->cs_thread); + if (This == pThreadPool) { + tpThreadNode *node = This->threads; + while (node) { + tpReadNode *rnode = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(tpReadNode)); + rnode->ctx = data; + rnode->pfnInit = pfnInit; + rnode->pfnRead = pfnRead; + rnode->next = node->Read; + if (rnode->next) rnode->next->prev = rnode; + node->Read = rnode; + SetEvent(node->hJob); + node = node->next; + } + } + LeaveCriticalSection(&This->cs_thread); +} diff --git a/dlls/dpnet/version.rc b/dlls/dpnet/version.rc index b6a8488..91ce570 100644 --- a/dlls/dpnet/version.rc +++ b/dlls/dpnet/version.rc @@ -1,26 +1,9 @@ -/* - * Copyright 2004 Raphael Junqueira - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#define WINE_FILEDESCRIPTION_STR "Wine DirectPlay 8" -#define WINE_FILENAME_STR "dpnet.dll" #define WINE_FILEVERSION 5,3,0,900 -#define WINE_FILEVERSION_STR "5.3.0.900" #define WINE_PRODUCTVERSION 5,3,0,900 -#define WINE_PRODUCTVERSION_STR "5.3" +#define WINE_FILEDESCRIPTION_STR "Cedega DirectPlay" +#define WINE_FILENAME_STR "dpnet.dll" +#define WINE_PRODUCTVERSION_STR "5.3.0000000.900" +#define WINE_PRODUCTNAME_STR "TransGaming Cedega" +#define WINE_FILEVERSION_STR "5.3.0000000.900 built by: Cedega" #include "wine/wine_common_ver.rc" diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 4e9be90..6182f22 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -68,6 +68,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "htiframe.h" #include "urlhist.h" #include "hlguids.h" +#include "dplay8.h" +#include "dpaddr.h" +#include "dplobby8.h" /* FIXME: cguids declares GUIDs but does not define their values */ @@ -79,6 +82,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(IID_IDirectPlaySP,0xc9f6360,0xcc61,0x11cf,0xac,0xec,0x00,0xaa,0x00,0x68,0x86,0xe3); DEFINE_GUID(IID_ISFHelper,0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00); DEFINE_GUID(IID_IDPLobbySP,0x5a4e5a20,0x2ced,0x11d0,0xa8,0x89,0x00,0xa0,0xc9,0x05,0x43,0x3c); +DEFINE_GUID(IID_IDirectPlay8ThreadPool_Internal,0x12f40839,0xe7a3,0x399b,0xab,0x45,0x9e,0x43,0x3d,0x8b,0x31,0x96); +DEFINE_GUID(IID_IDirectPlay8ServiceProvider,0x985e2c76,0x66bc,0x4d66,0xad,0x8e,0xed,0x38,0x1,0xf1,0xb4,0x59); DEFINE_GUID(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9); DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE); diff --git a/include/dpaddr.h b/include/dpaddr.h index 8300729..240571b 100644 --- a/include/dpaddr.h +++ b/include/dpaddr.h @@ -21,13 +21,13 @@ #include <ole2.h> #include <dplay8.h> +#include <winsock2.h> #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ typedef REFIID DPNAREFIID; -typedef struct sockaddr SOCKADDR; /***************************************************************************** * DirectPlay8Addr defines @@ -56,6 +56,8 @@ typedef struct sockaddr SOCKADDR; #define DPNA_KEY_FLOWCONTROL_A "flowcontrol" #define DPNA_KEY_HOSTNAME_A "hostname" #define DPNA_KEY_NAMEINFO_A "nameinfo" +#define DPNA_KEY_NAT_RESOLVER_A "natresolver" +#define DPNA_KEY_NAT_RESOLVER_USER_STRING_A "natresolveruserstring" #define DPNA_KEY_PARITY_A "parity" #define DPNA_KEY_PHONENUMBER_A "phonenumber" #define DPNA_KEY_PORT_A "port" @@ -94,6 +96,8 @@ typedef struct sockaddr SOCKADDR; # define DPNA_KEY_FLOWCONTROL (const WCHAR []){ 'f','l','o','w','c','o','n','t','r','o','l',0 } # define DPNA_KEY_HOSTNAME (const WCHAR []){ 'h','o','s','t','n','a','m','e',0 } # define DPNA_KEY_NAMEINFO (const WCHAR []){ 'n','a','m','e','i','n','f','o',0 } +# define DPNA_KEY_NAT_RESOLVER (const WCHAR []){'n', 'a', 't', 'r', 'e', 's', 'o', 'l', 'v', 'e', 'r', 0} +# define DPNA_KEY_NAT_RESOLVER_USER_STRING (const WCHAR []){'n', 'a', 't', 'r', 'e', 's', 'o', 'l', 'v', 'e', 'r', 'u', 's', 'e', 'r', 's', 't', 'r', 'i', 'n', 'g', 0} # define DPNA_KEY_PARITY (const WCHAR []){ 'p','a','r','i','t','y',0 } # define DPNA_KEY_PHONENUMBER (const WCHAR []){ 'p','h','o','n','e','n','u','m','b','e','r',0 } # define DPNA_KEY_PORT (const WCHAR []){ 'p','o','r','t',0 } @@ -130,6 +134,8 @@ typedef struct sockaddr SOCKADDR; # define DPNA_KEY_FLOWCONTROL L"flowcontrol" # define DPNA_KEY_HOSTNAME L"hostname" # define DPNA_KEY_NAMEINFO_A L"nameinfo" +# define DPNA_KEY_NAT_RESOLVER L"natresolver" +# define DPNA_KEY_NAT_RESOLVER_USER_STRING L"natresolveruserstring" # define DPNA_KEY_PARITY L"parity" # define DPNA_KEY_PHONENUMBER L"phonenumber" # define DPNA_KEY_PORT L"port" @@ -166,6 +172,8 @@ static const WCHAR DPNA_KEY_DEVICE[] = { 'd','e','v','i','c','e',0 }; static const WCHAR DPNA_KEY_FLOWCONTROL[] = { 'f','l','o','w','c','o','n','t','r','o','l',0 }; static const WCHAR DPNA_KEY_HOSTNAME[] = { 'h','o','s','t','n','a','m','e',0 }; static const WCHAR DPNA_KEY_NAMEINFO[] = { 'n','a','m','e','i','n','f','o',0 }; +static const WCHAR DPNA_KEY_NAT_RESOLVER[] = {'n', 'a', 't', 'r', 'e', 's', 'o', 'l', 'v', 'e', 'r', 0}; +static const WCHAR DPNA_KEY_NAT_RESOLVER_USER_STRING[] = {'n', 'a', 't', 'r', 'e', 's', 'o', 'l', 'v', 'e', 'r', 'u', 's', 'e', 'r', 's', 't', 'r', 'i', 'n', 'g', 0}; static const WCHAR DPNA_KEY_PARITY[] = { 'p','a','r','i','t','y',0 }; static const WCHAR DPNA_KEY_PHONENUMBER[] = { 'p','h','o','n','e','n','u','m','b','e','r',0 }; static const WCHAR DPNA_KEY_PORT[] = { 'p','o','r','t',0 };

2 5

Re: PATCH: fix out of range array access in dlls/kernel32/relay16.c (fwd)
by Alexandre Julliard 02 Dec '07

02 Dec '07

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > Alexandre, > > I checked again and if we don't address this we'll get two new warnings > issues in a default build with GCC 4.3. How does the patch below > look? Not good, it adds noise to the code for no good reason. Why would gcc complain about that one? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: user32: Add a FIXME for animated cursors. [try 2]
by Chris Wulff 01 Dec '07

01 Dec '07

There was a patch not all that long ago that actually implemented animated cursors that I have been using. Does anybody know why it wasn't accepted? It seems to work pretty well anyway. (I attached it for reference, but it was submitted on 9/4/2007 by Trent Waddington.) On Sat, 2007-12-01 at 13:34 -0800, Andrew Riedi wrote: > changelog: user32: Add a FIXME for animated cursors. > > Sorry for sending twice. > > There is no need to set hIcon, as it was already set to zero. Here is > the correct version. > > -- > Andrew Riedi

1 0

Re: WineD3D: Implement detection of ATI cards with Mesa DRI drivers [try 4] (resend)
by Roderick Colenbrander 01 Dec '07

01 Dec '07

> Hello. > > Some time ago I have sent this patch, but it didn't get accepted. I wonder > what is the final word on it. > Was it simply lost, or is not yet satisfactory for inclusion in some way. > > > Thanks. > I think I gave a reply on it. I can't easily search it back now but it should be on the wine-devel archives. In short my answer was to use D3DX_CAPABLE first and later on the string checks. The reason is that the GL capabilities can change depending on lets say remote GLX. The renderer string can still be the same. Roderick -- GMX FreeMail: 1 GB Postfach, 5 E-Mail-Adressen, 10 Free SMS. Alle Infos und kostenlose Anmeldung: http://www.gmx.net/de/go/freemail

1 0

'Make test' fails for cabinet.dll
by Roy Decoutere 01 Dec '07

01 Dec '07

Hello, I'm relatively new to Wine and would like to start contributing. So running 'make test' on my systems seemed like a good beginning. I have a desktop and a laptop, both running Gentoo with X/fluxbox and a very similar setup. On the laptop the tests for cabinet.dll succeed, but on the desktop they fail with the output below. make[2]: Entering directory `/usr/src/wine/dlls/cabinet/tests' ../../../tools/runtest -q -P wine -M cabinet.dll -T ../../.. -p cabinet_test.exe.so extract.c && touch extract.ok extract.c:623: Test failed: Expected dest\a.txt to not exist extract.c:665: Test failed: Expected dest\testdir\c.txt to not exist make[2]: *** [extract.ok] Error 2 make[2]: Leaving directory `/usr/src/wine/dlls/cabinet/tests' I've checked test.winehq.org and I haven't seen reports of cabinet.dll failing. I've also reran the tests on the desktop with a new and clean .wine folder, but this still has the same result. It at least happens with 0.9.49 and 0.9.50. Could somebody give me a hint on how to proceed in figuring this out? Thanks in advance, Roy

1 0

re: ntdll: unload modules based on inter-module dependencies
by Dan Kegel 01 Dec '07

01 Dec '07

This patch seems to break wineprefixcreate.

2 1

None
by Darragh Bailey 01 Dec '07

01 Dec '07

Cc: Bcc: Subject: Re: xlviewer install cmdline passed from CreateProcessA to msiexec looks wrong Reply-To: In-Reply-To: <20071124025012.GA27234(a)compsoc.nuigalway.ie> After doing further debugging I've come to the conclusion that the behaviour found when I was looking at bug 9628 is indeed a bug and have logged a new one accordingly with as much detail as I thought was necessary. http://bugs.winehq.org/show_bug.cgi?id=10618 Basically it turns out that if a program is called via CreateProcessW, the command line used may not result in the same argv being passed to the target program as it was called directly. In this case there was a difference in the argv seen by msiexec depending on whether it was run directly or called by the setup exe. Traced the bug to a corner case in the function build_argv in dlls/kernel32/process.c. Basically it does not detect the end of the argument correctly when dealing with the following text. SETUPEXEPATH=\"C:\\windows\\temp\\IXP030.TMP\\\" Because of the escaped '\', which should be valid since it is part of a directory path, at the end followed by the escaped '"', the function thinks that it has just encountered an escaped '"' instead of the end of the argument. I'm not 100% sure how to solve this, so I will probably have to run some tests on windows using the CreateProcessW call and study the argv received by the target. I have a feeling that the rule is probably something like: If in quotes && text before slashes != whitespace && text after quote == whitespace: then found matching quote Hopefully I should be able to come up with test cases that will show the truth of this, and then be able to confirm what the function build_argv should be testing to catch cases like this. -- Darragh "Nothing is foolproof to a sufficiently talented fool."

1 0

Re: wininet: Add test for FtpGetCurrentDirectoryA
by James Hawkins 01 Dec '07

01 Dec '07

On Nov 30, 2007 3:47 PM, Zac Brown <zac(a)zacbrown.org> wrote: > Hi, > > Changelog: > * Add a test in dlls/wininet/tests/ftp.c for FtpGetCurrentDirectoryA > > Notes: > * This test passes fully without error on Windows XP, with the test compiled by Visual Studio Express C++ 2008. > * The functions this test call are currently broken in wine and I am in the process of fixing them myself. > > Patch is pasted below: > > > --- > dlls/wininet/tests/ftp.c | 84 +++++++++++++++++++++++++++++++++++++++++++++- > 1 files changed, 83 insertions(+), 1 deletions(-) > > diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c > index 6d03fb8..f6517b0 100644 > --- a/dlls/wininet/tests/ftp.c > +++ b/dlls/wininet/tests/ftp.c > @@ -691,6 +691,85 @@ static void test_command(HINTERNET hFtp, HINTERNET hConnect) > } > } > > +static void test_get_current_dir(HINTERNET hFtp, HINTERNET hConnect) > +{ > + BOOL bRet; > + DWORD dwCurrentDirectory = MAX_PATH; > + CHAR lpszCurrentDirectory[MAX_PATH]; > + > + /* change directories to get a more interesting pwd */ > + bRet = FtpCommandA(hFtp, FALSE, FTP_TRANSFER_TYPE_ASCII, "CWD pub/", 0, NULL); > + if(bRet == FALSE) > + { > + trace("Failed to change directories in test_get_current_dir(HINTERNET hFtp).\n"); > + return; > + } > + > + /* test with all NULL arguments */ > + SetLastError(0xdeadbeef); > + bRet = FtpGetCurrentDirectoryA( NULL, NULL, 0 ); > + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n" ); > + ok ( GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got: %d\n", GetLastError()); > + > + /* test with NULL parameters instead of expected LPSTR/LPDWORD */ > + SetLastError(0xdeadbeef); > + bRet = FtpGetCurrentDirectoryA( hFtp, NULL, 0 ); > + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n" ); > + ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got: %d\n", GetLastError()); > + > + /* test with no valid handle and valid parameters */ > + SetLastError(0xdeadbeef); > + bRet = FtpGetCurrentDirectoryA( NULL, lpszCurrentDirectory, &dwCurrentDirectory ); > + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n" ); > + ok ( GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got: %d\n", GetLastError()); > + > + /* test with invalid dwCurrentDirectory and all other parameters correct */ > + SetLastError(0xdeadbeef); > + bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, 0 ); > + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n" ); > + ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got: %d\n", GetLastError()); > + > + /* test with invalid lpszCurrentDirectory and all other parameters correct */ > + SetLastError(0xdeadbeef); > + bRet = FtpGetCurrentDirectoryA( hFtp, NULL, &dwCurrentDirectory ); > + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n" ); > + ok ( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got: %d\n", GetLastError()); > + > + /* test to show it checks the handle type */ > + SetLastError(0xdeadbeef); > + bRet = FtpGetCurrentDirectoryA( hConnect, lpszCurrentDirectory, &dwCurrentDirectory ); > + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n" ); > + ok ( GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, > + "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got: %d\n", GetLastError()); > + > + /* test for the current directory with legitimate values */ > + SetLastError(0xdeadbeef); > + bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, &dwCurrentDirectory ); > + ok ( bRet == TRUE, "Expected FtpGetCurrentDirectoryA to pass\n" ); > + ok ( lstrcmp(lpszCurrentDirectory, "/pub") == 0, "Expected returned value \"%s\" to match \"%s\" \n", (char*)lpszCurrentDirectory, "/pub"); > + ok ( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got: %d\n", GetLastError()); > + > + > + /* test for the current directory with a size only large enough to > + * fit the string and not the null terminating character */ > + SetLastError(0xdeadbeef); > + dwCurrentDirectory = 4; > + lpszCurrentDirectory[4] = 'a'; /* set position 4 of the array to something else to make sure a leftover \0 isn't fooling the test */ > + bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, &dwCurrentDirectory ); > + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n"); > + ok ( lstrcmp(lpszCurrentDirectory, "/pub") != 0, "Expected returned value \"%s\" to not match \"%s\" \n", (char*)lpszCurrentDirectory, "/pub"); > + ok ( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got: %d\n", GetLastError()); > + > + /* test for the current directory with a size large enough to store > + * the expected string as well as the null terminating character */ > + SetLastError(0xdeadbeef); > + dwCurrentDirectory = 5; > + bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, &dwCurrentDirectory ); > + ok ( bRet == TRUE, "Expected FtpGetCurrentDirectoryA to pass\n"); > + ok ( lstrcmp(lpszCurrentDirectory, "/pub") == 0, "Expected returned value \"%s\" to match \"%s\" \n", (char*)lpszCurrentDirectory, "/pub"); > + ok ( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got: %d\n", GetLastError()); > +} > + > START_TEST(ftp) > { > HANDLE hInternet, hFtp, hHttp; > @@ -733,7 +812,10 @@ START_TEST(ftp) > test_removedir(hFtp, hHttp); > test_renamefile(hFtp, hHttp); > test_command(hFtp, hHttp); > - > +todo_wine > +{ > + test_get_current_dir(hFtp, hHttp); > +} > InternetCloseHandle(hHttp); > InternetCloseHandle(hFtp); > InternetCloseHandle(hInternet); > You put the todo_wine around each block of ok's that fail, not around the whole test function. -- James Hawkins

2 1

Visual C++ 5 works pretty well...
by Dan Kegel 01 Dec '07

01 Dec '07

For fun, I installed Visual C++ 5 and built a few things with it. Ran very nicely. Filed two bugs: http://bugs.winehq.org/show_bug.cgi?id=10623 (VC++ 5 doesn't know who registered it) http://bugs.winehq.org/show_bug.cgi?id=10622 (VC++ 5 hangs on exit) It complained a bit if I didn't install MFC40.DLL before building MFC apps. Also, the dialog to add include directories acted strangely; Tools / Options / Directories lets you insert a new directory, and pretends to let you browse for it, but it acts very oddly after navigating to the first folder; clicking on that doesn't open the folder as expected, but rather just selects that folder. (Not sure if that's different on Windows, but it sounds like a wine bug.) Debugging, compiling simple floating point apps, editing all worked smoothly. Nice! I don't know how stable it is on long use; all my sessions were short. - Dan

1 0

d3dx8 [patch 1/10] Implement D3DXPlaneFromPointNormal
by "Luis C. Busquets Pérez" 30 Nov '07

30 Nov '07

I still do not see why it is not possible to have only one folder dlls/d3dx9/ with the thirteen spec files inside. After all, the vast majority of its code is repeated and it is the same system ctl3d, ctl3d32 and ctl3dv2 use as the three specs are in dlls/ctl3d32 This is not creating subfolders in dlls/d3dx9 but just putting all spec files in it.

1 0

Note to packagers: choose gcc version carefully when building wine
by Dan Kegel 30 Nov '07

30 Nov '07

Attention packagers: the default version of gcc on many distros happens to generate Wine binaries which make some copy protection schemes unhappy. At the moment, gcc-3.3.x, gcc-3.4.x, and gcc-4.2.x are known to work; gcc-4.0.x is known to not work. Please check the compiler you use when building wine packages and make sure it's one of the good ones. To really check, find a retail copy of Photoshop CS or CS2 (not 7 or CS3) and install from cd-rom. If it aborts silently near the end without offering to activate the product, you have an unsupported compiler, and users of your packages might run into trouble with apps protected with safedisc. See http://bugs.winehq.org/show_bug.cgi?id=10273 for more info. - Dan

1 0

d3dx8 dll
by David.Adam＠math.cnrs.fr 30 Nov '07

30 Nov '07

My second patch was not committed, because Alexandre wants all the functions to be implemented in d3dx9-36.dll. Then, the other d3dx9_xx dll forward their functions to d3dx9_36.dll. David

1 0

d3dx8 [patch 1/10] Implement D3DXPlaneFromPointNormal
by tony.wasserka＠freenet.de 30 Nov '07

30 Nov '07

Okay, then that has been discussed. By the way, what about David's second patch? Was there anything wrong about it or why isn't it in the tree, yet?

1 0

d3dx8 [patch 1/10] Implement D3DXPlaneFromPointNormal
by tony.wasserka＠freenet.de 30 Nov '07

30 Nov '07

> So, just to clarify, you propose to create a d3dx9.dll dll, putting its > code in dlls/d3dx9. Does this dll exist on Windows? If not, then we > should call it wined3dx9 (and its code would go in dlls/wined3dx9). Well, it shouldn't even be a dll, just a folder were put in all the d3dx9 code and let the d3dx9_xx.dlls just export the functions they need. I don't know of how much the makefile system is capable, but maybe we can put all the d3dx9_xx.spec files in the same directory to improve overviewability, I don't like these 13 dlls/d3dx9 directories that much :D Anyways, what are the concrete differences between the d3dx9_xx.dlls?

2 1

Re: [Patch] for wined3d: Correcting order issue
by Roderick Colenbrander 30 Nov '07

30 Nov '07

> Hi all, > > This patch repairs my previous one, as the command never got executed, > because 8600 matches before 8600M. > > > Marco Schuster > > ---- > diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c > index e4b5bdf..50b3250 100644 > --- a/dlls/wined3d/directx.c > +++ b/dlls/wined3d/directx.c > @@ -950,6 +950,11 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info > *gl_info) { > gl_info->gl_card = CARD_NVIDIA_GEFORCE_8800GTS; > vidmem = 320; /* The 8800GTS uses 320MB, a 8800GTX > can have 768MB */ > } > + /* Geforce8 - midend mobile */ > + else if(strstr(gl_info->gl_renderer, "8600 M")) { > + gl_info->gl_card = CARD_NVIDIA_GEFORCE_8600MGT; > + vidmem = 512; > + } > /* Geforce8 - midend */ > else if(strstr(gl_info->gl_renderer, "8600") || > strstr(gl_info->gl_renderer, "8700")) > @@ -957,11 +962,6 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info > *gl_info) { > gl_info->gl_card = CARD_NVIDIA_GEFORCE_8600GT; > vidmem = 256; > } > - /* Geforce8 - midend mobile */ > - else if(strstr(gl_info->gl_renderer, "8600 M")) { > - gl_info->gl_card = CARD_NVIDIA_GEFORCE_8600MGT; > - vidmem = 512; > - } > /* Geforce8 - lowend */ > else if(strstr(gl_info->gl_renderer, "8300") || > strstr(gl_info->gl_renderer, "8400") || > I would prefer not to extend the list with lots of additional models. In my opinion it isn't really needed as the list would become a lot longer and this makes it harder to maintain. If we would continue this way we would easily have to add two dozen additional mobile cards which are now handled as their desktop equivalents. Roderick -- Psssst! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen: http://www.gmx.net/de/go/multimessenger

2 1

Re: [4/4] WineD3D: Enabling too many lights is silently ignored
by H. Verbeet 30 Nov '07

30 Nov '07

On 30/11/2007, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > But you're not creating the lights first with SetLight(). IIRC you can create lots of lights with SetLight(), but only enable MaxActiveLights at the same time with LightEnable(). I guess calling LightEnable on a light that isn't created first is simply ignored. I thought that at least for ddraw I created a test for this back when I started working on wine, but perhaps I never sent it in. :-/

2 1

Re: [1/4] WineD3D: mov to a0.x does a floor(), not a round to nearest
by Alexandre Julliard 30 Nov '07

30 Nov '07

Stefan Dösinger <stefan(a)codeweavers.com> writes: > I sent this patch already, and it was committed and shows up in the 0.9.49 > changelog. The commit ID is 6209b36acbef6e7f8edcf3a45a006bb09bffe4af, but > somehow the functional change was reverted again in > 0183f3e305ae1e40a806682ec85e8b4507e4ddd8 and the test was reverted in > 4454096db27e7560cce99367b45be3b24dd0894a Most likely what happened is that I applied it, then reverted it because it caused test failures, but I didn't remove the commit properly. Anyway, it's still failing: ../../../tools/runtest -q -P wine -M d3d9.dll -T ../../.. -p d3d9_test.exe.so visual.c && touch visual.ok visual.c:5165: Test failed: The device was not properly freed: refcount 1 make[2]: *** [visual.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Some thoughts about next GSoC
by Kai Blin 30 Nov '07

30 Nov '07

Hi folks, from what we discussed at the last WineConf, we wanted to work on our procedures for the Google Summer of Code a little. I'm sending this email in hope to start some discussion about this, so we have it out of the way until the 2008 version is announced so we can talk about proposed projects then. The goal of Wine's SoC procedures should be to get high-quality proposals that can be completed by the student proposing the project in the time allocated for GSoC, so both scope and difficulty should be checked. I haven't been on the mentoring side of things, but my understanding from the WineConf side of things was that we had some problems getting this right the past years. I was thinking about strongly encouraging people to post their project proposal to wine-devel prior to applying, so more developers can have a look at it and see if it's doable or not and offer suggestions. I know some projects did an introductory quiz to figure out the student's coding skills, I'm not convinced the knowledge needed for Wine can be tested in a quiz. What do you think? Another thing that didn't turn out too well last time is that it was really hard to figure out what was going on during the summer. I have a few ideas on how we could address this. Lots of other projects had their student write a weekly public progress report. I think we should require the same. This will probably help keeping people updated, and might help spotting problems early. According to the wiki page, we already require a post-mortem report on the project, however I can't remember seeing much of those this year. We should make sure those are written next time. We might think of a better name for the report, post-mortem sounds like the project is dead after the summer, we want people to keep working. Last year, some of the students set up a public git repo on repo.or.cz. I was thinking about making that a requirement for next year. This would allow people to review work in progress. Comments? Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

5 11

re: shell32: symlink user's profile shell folders to xdg well known directories [2/2] (try 3)
by Dan Kegel 30 Nov '07

30 Nov '07

I feel like a broken record, but: some apps don't like following symlinks, and the native Windows way to configure what the "My Foo" folders point to is called shell folder redirection; These are documented at http://support.microsoft.com/kb/242557 among other places, and I think Wine supports these registry settings. Is there any reason we don't want to use these instead of symlinks? - Dan

3 2

d3dx8 [patch 1/10] Implement D3DXPlaneFromPointNormal
by tony.wasserka＠freenet.de 30 Nov '07

30 Nov '07

Anyways, where should we put the d3dx9 code? I mean, we have 13 folders to choose from.. Perhaps It'd be better if we create a new dll (or at least directory) called d3dx9 were we implement all d3dx9 stuff and let the other d3dx9_xx dlls just call these functions? This would improve the clarity of the code structure, so that people that don't follow this discussion can also understand what we're doing ;-)

3 2

Re: urlmon: Rename the wrappers around HeapAlloc() &Co to use the new standard naming.
by Steven Edwards 30 Nov '07

30 Nov '07

Hi, On Nov 29, 2007 4:12 PM, Michael Stefaniuc <mstefani(a)redhat.de> wrote: > diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h > index aeb0eb2..9f31fb9 100644 > --- a/dlls/urlmon/urlmon_main.h > +++ b/dlls/urlmon/urlmon_main.h > @@ -63,22 +63,22 @@ HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); > > HRESULT create_binding_protocol(LPCWSTR url, IInternetProtocol **protocol); > > -static inline void *urlmon_alloc(size_t len) > +static inline void *heap_alloc(size_t len) > { > return HeapAlloc(GetProcessHeap(), 0, len); > } > > -static inline void *urlmon_alloc_zero(size_t len) > +static inline void *heap_alloc_zero(size_t len) > { > return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); > } > > -static inline void *urlmon_realloc(void *mem, size_t len) > +static inline void *heap_realloc(void *mem, size_t len) > { > return HeapReAlloc(GetProcessHeap(), 0, mem, len); > } > > -static inline BOOL urlmon_free(void *mem) > +static inline BOOL heap_free(void *mem) > { > return HeapFree(GetProcessHeap(), 0, mem); > } Rather than duplicating these inline functions in each dlls private header, could we add the heap wrappers somewhere like winbase.h and mark it as a wine extension? Doing it there would make sense as winbase.h is where HeapAlloc and friends is defined. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

2 1

wine for two, please.
by Athel 30 Nov '07

30 Nov '07

Hi Rob, i was looking a long time the way to do this. Can you help me to done this?, plis I really need it. If I could understand better the functionality I'll do it for myself. Sorry for my english. Regaards Athel > I was going to wait til tomorrow to test this, but couldnt wait. > This works perfectly for my app and couldnt have came at a better time. > > I just created a simple Win32 dispatcher program for each screen and sent > the window creation messages to the HWNDs from FindWindow instead of the > local app and it creates the dialogs on any screen I want. Joy Joy!!!!! > > It worked out perfectly since the threads that create windows have to send > messages to the main loop for it to create them so that the dialogs dont > from close when the thread exits anyway. > > It is refreshing that after I went through all the battles of getting > multihead display, gcc, and wine running on Solaris that FINALLY something > would work so simply. > > Thanks again to the whole Wine crew that made this possible!!!

1 0

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