September 2008 - Wine-devel

RE: wined3d: add missing HeapFree
by Stefan Dösinger 05 Sep '08

05 Sep '08

This looks ok to me > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Jeff Zaroyko > Sent: Friday, September 05, 2008 11:19 AM > To: wine-patches(a)winehq.org > Subject: wined3d: add missing HeapFree >

1 0

Re: user32: Resend Check for NULL pData in DdeClientTransaction expecting to be passed a handle
by Alexandre Julliard 05 Sep '08

05 Sep '08

Jeff Latimer <lats(a)yless4u.com.au> writes: > @@ -1157,7 +1157,10 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS > /* Windows simply ignores hszItem and wFmt in this case */ > if (pData == NULL) > { > - pConv->instance->lastError = DMLERR_INVALIDPARAMETER; > + if (cbData == -1) > + pConv->instance->lastError = DMLERR_INVALIDPARAMETER; > + else > + pConv->instance->lastError = DMLERR_MEMORY_ERROR; > return 0; > } > pXAct = WDML_ClientQueueExecute(pConv, pData, cbData); It would be cleaner to do the checks inside WDML_ClientQueueExecute since it already handles the cbData==-1 case differently. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: notepad: Only append .txt to missing files without a dot in them
by Alexandre Julliard 05 Sep '08

05 Sep '08

Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> writes: > @@ -590,7 +591,8 @@ static void HandleCommandLine(LPWSTR cmdline) > static const WCHAR txtW[] = { '.','t','x','t',0 }; > > /* try to find file with ".txt" extension */ > - if (!lstrcmp(txtW, cmdline + lstrlen(cmdline) - lstrlen(txtW))) > + if (!lstrcmp(txtW, cmdline + lstrlen(cmdline) - lstrlen(txtW)) || > + strchrW(cmdline, '.')) There's no point in checking for .txt if any extension will match anyway. Also you should most likely check for a dot only in the filename, not in the whole path. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [5/5] user32: Move character conversion logic to dde_server.d & remove todo's
by Alexandre Julliard 05 Sep '08

05 Sep '08

Jeff Latimer <lats(a)yless4u.com.au> writes: > @@ -772,12 +774,51 @@ static WDML_QUEUE_STATE WDML_ServerHandleExecute(WDML_CONV* pConv, WDML_XACT* pX > > if (ptr) > { > - hDdeData = DdeCreateDataHandle(0, ptr, GlobalSize(pXAct->hMem), > + DWORD memSize, ptrSize = GlobalSize(pXAct->hMem); > + > + TRACE("Client is %s, Server is %s, Text is %s\n", > + IsWindowUnicode(pConv->hwndClient) ? "Unicode" : "ANSI", > + IsWindowUnicode(pConv->hwndServer) ? "Unicode" : "ANSI", > + IsTextUnicode(ptr, ptrSize, NULL) ? "Unicode" : "ANSI"); > + > + if (!(IsWindowUnicode(pConv->hwndClient)) && !(IsWindowUnicode(pConv->hwndServer)) && IsTextUnicode(ptr, ptrSize, NULL)) > + memSize = WideCharToMultiByte( CP_ACP, 0, ptr, ptrSize / sizeof(WCHAR), NULL, 0, NULL, NULL); > + > + else if (IsWindowUnicode(pConv->hwndServer) && !IsTextUnicode(ptr, ptrSize, NULL)) > + memSize = MultiByteToWideChar( CP_ACP, 0, ptr, ptrSize, NULL, 0) * sizeof(WCHAR); Using IsTextUnicode doesn't look right, you shouldn't need to guess. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: sane.ds: Workaround for wsprintf does not support floats.
by Alexandre Julliard 05 Sep '08

05 Sep '08

"Lei Zhang" <thestig(a)google.com> writes: > Float values in sane dialogs show up as "f". This is because wsprintf > does not support %f. This started occurring in commit > 4fd668d01088e82b4639ee2f4f088e0b718e6a88. sprintfW should work. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winemenubuilder: eliminate wineshelllink
by Alexandre Julliard 05 Sep '08

05 Sep '08

"Damjan Jovanovic" <damjan.jov(a)gmail.com> writes: > @@ -169,6 +170,10 @@ MAKE_FUNCPTR(png_write_info); > MAKE_FUNCPTR(png_write_row); > #undef MAKE_FUNCPTR > > +static char xdg_config_dir[MAX_PATH]; > +static char xdg_data_dir[MAX_PATH]; > +static char xdg_desktop_dir[MAX_PATH]; MAX_PATH is not appropriate for unix paths, please allocate them dynamically. > + if (filename[i] == '/' && i > 0) > + { > + struct stat st; > + filename[i] = 0; > + if (stat(filename, &st) != 0) > + { > + if (errno == ENOENT) > + { > + if (mkdir(filename, 0777)) > + ret = FALSE; > + } mkdir fails on existing paths, there's no need to stat first. > + snprintf(xpmPath, xpmPathLen, "%s/icons/%s", xdg_data_dir, name); > + dot = strrchr(xpmPath, '.'); > + if (dot != NULL) > + *dot = 0; You should only match a dot in the filename, not in the directory. > + dst = fopen(xpmPath, "w"); > + if (dst) > + { > + char buffer[8096]; What's with the strange size? > + if (getenv("WINEPREFIX")) > + snprintf(winePrefix, sizeof(winePrefix), "%s", getenv("WINEPREFIX")); > + else > + snprintf(winePrefix, sizeof(winePrefix), "%s/.wine", getenv("HOME")); You want wine_get_config_dir(). -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32: Test import entries of a core windows DLL (riched20.dll)
by Paul Vriens 05 Sep '08

05 Sep '08

Roy Shea wrote: > --- > dlls/kernel32/tests/Makefile.in | 1 + > dlls/kernel32/tests/loader_image.c | 80 ++++++++++++++++++++++++++++++++++++ > 2 files changed, 81 insertions(+), 0 deletions(-) > create mode 100644 dlls/kernel32/tests/loader_image.c > > > ------------------------------------------------------------------------ > > No license and copyright information? -- Cheers, Paul.

1 0

Patch for vertex > 4 shaders
by Chris Ahrendt 04 Sep '08

04 Sep '08

>Hmm. Does the application use a fixed function texture coordinate specified >with D3DECLUSAGE_FLOAT4? I don't know I can look in my logs and see if I see it... but don't remember off the top of my head at the moment. >It should be simple to support this. Essentially the "int coordsToUse = >sd->u.s.texCoords[coordIdx].dwType + 1" is wrong, this needs a better mapping: >decltype: coordsToUse: >D3DDECLTYPE_FLOAT1 1 >D3DDECLTYPE_FLOAT2 2 >D3DDECLTYPE_FLOAT3 3 >D3DDECLTYPE_FLOAT4 4 >D3DDECLTYPE_D3DCOLOR 4 >D3DDECLTYPE_UBYTE4 4 >D3DDECLTYPE_SHORT2 2 >D3DDECLTYPE_SHORT4 4 >D3DDECLTYPE_UBYTE4N 4 >D3DDECLTYPE_SHORT2N 2 >D3DDECLTYPE_SHORT4N 4 >D3DDECLTYPE_USHORT2N 2 >D3DDECLTYPE_USHORT4N 4 >D3DDECLTYPE_UDEC3 3 >D3DDECLTYPE_DEC3N 3 >D3DDECLTYPE_FLOAT16_2 2 >D3DDECLTYPE_FLOAT16_4 4 The app. should pass these in to us already in the correct format >Also the function calls below shouldn't be selected based on a >switch-case statement, but rather on the declaration itself. q, r, t >and s should be read in a different way too. The system used for >providing other parameters like diffuse_funcs sounds sane here, >although some extra care is needed to >keep working without >GL_ARB_multitexture support. ok explain... I am lost here.. like I said earlier I divided it into the gl calls (float, int, short) and the screen went a little bonkers... so any suggestions here would be great =) Was thinking about it on the trip to the airport and came up with the following pseudo code: switch( vertex shader type) { case D3DDECLTYPE_FLOAT1: g = value 1; totalParms = 1; break; case D3DDECLTYPE_FLOAT2: case D3DDECLTYPE_SHORT2: case D3DDECLTYPE_USHORT2N: case D3DDECLTYPE_SHORT2N: case D3DDECLTYPE_FLOAT16_2: g = value1; r = value2; totalParms=2; break; case D3DDECLTYPE_FLOAT3: case D3DDECLTYPE_UDEC3: case D3DDECLTYPE_DEC3N: g = value1; r = value2; t= value3; totalParms=3; break; case D3DDECLTYPE_FLOAT4: case D3DDECLTYPE_D3DCOLOR: case D3DDECLTYPE_UBYTE4: case D3DDECLTYPE_SHORT4: case D3DDECLTYPE_UBYTE4N: case D3DDECLTYPE_SHORT4N: case D3DDECLTYPE_USHORT4N: case D3DDECLTYPE_FLOAT16_4: g = value1; r = value2; t= value3; s = value4; totalParms=4; break; default: TRACE("Error\n"); return; break; } switch(totalParms) { case 1: gl call with 1 parm break; case 2: gl call with 2 parms break; case 3: gl call with 3 parms break; case 4: gl call with 4 parms break; default: TRACE("ERROR\n"); break; } >Also I strongly recommend writing a test here. Generally, fixed >function attributes with non-standard data types are spooky on Windows, >so the real problem may be somewhere else. Is there currently a test case for this written? I think on windows it just ignores the parms to be honest.. Chris

1 1

Re: Recent msi/package tests failures
by James Mckenzie 04 Sep '08

04 Sep '08

James: >From: James Hawkins <truiken(a)gmail.com> >Sent: Sep 1, 2008 10:49 AM >To: James Mckenzie <jjmckenzie51(a)earthlink.net> >Cc: Paul Vriens <paul.vriens.wine(a)gmail.com>, "wine-devel(a)winehq.org" <wine-devel(a)winehq.org> >Subject: Re: Recent msi/package tests failures > >On Mon, Sep 1, 2008 at 10:18 AM, James Mckenzie ><jjmckenzie51(a)earthlink.net> wrote: >> Paul/James: >> Paul Vriens wrote: >>>James Hawkins wrote: >>>> On Sat, Aug 30, 2008 at 3:17 PM, Paul Vriens <paul.vriens.wine(a)gmail.com> wrote: >>>>> Hi, >>>>> >>>>> I just sent a few patches that fix the problem with the timeout on my >>>>> machines. >>>>> >>>>> Do you think it's still worthwhile to disable logging by using >>>>> MsiEnableLogA? When I now look in my temp folder I have a few hundred MSI >>>>> log files. We could either disable logging or create 1 file ourselves and >>>>> append everything to there (removing it afterwards maybe). >>>>> >>>> >>>> Logging to one file takes just as long as any other type of logging. >>>> No logging should be happening. No I don't think it's worth using >>>> MsiEnableLog to disable loggin. Logging is not enabled by default, >>>> and to enable it you have to change some registry entries, which I >>>> doubt anyone is doing. >>>> >>>The reason for the 1 file was not to speed up things but to limit the number of >>>logfiles in the temp directory (and maybe the ability to remove this file as we >>>know the one we created ourselves). >>> >>>On all of my boxes (95/98/NT/W2K/ 2 times XP/W2K3/Vista) I end up with 200 or so >>>logfiles in the temp directory after running the install tests. On none of these >>>boxes did I do anything to tinker with the msi logging settings. >>> >>>It would be nice if other could tell if they have a huge number of these >>>logfiles in their temp directory after running the tests. >>> >> >> +1 to one log file. I hate having to look through piles of log files to find errors. Yes, I know that I could grep them, but that is an added step that should not be needed. >> > >Why would you be grep'ing windows msi log files? > grep is the tool of choice when working with Linux/UNIX text files and searching through thousands of them. If this process is run on Wine in the state that I understand it is, and I may be incorrect, thousands of logging files may be created. Also it is less resource intensive to search one text file under Windows, unless the file is very, very large (> 1 MB). Searching a directory of thousands of files can take a long time (I have experience with this.) One file per run is all that should be created, IMHO. James McKenzie

4 9

re: [PATCH] buffer overflow checking for string functions
by Dan Kegel 04 Sep '08

04 Sep '08

Hi Marcus, http://kegel.com/wine/patchwatcher/results/ shows your patch seems to have caused a test to fail. The full log is at http://kegel.com/wine/patchwatcher/results/1045.log Can you check it and see if it's spurious, or if this is something you need to fix up, or if it was a lurking bug? Thanks, Dan p.s. the interesting bit is: ../../../tools/runtest -q -P wine -M msxml3.dll -T ../../.. -p msxml3_test.exe.so saxreader.c && touch saxreader.ok wine: Unhandled exception 0xc0000409 at address 0x60415fa0 (thread 0062), starting debugger... Unhandled exception: 0xc0000409 in 32-bit code (0x60416016). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:60416016 ESP:0032f174 EBP:0032f1d8 EFLAGS:00000246( - 00 - IZP1) EAX:603ffc99 EBX:60485d88 ECX:001230a8 EDX:00000000 ESI:6053eda0 EDI:00000000 Stack dump: 0x0032f174: 610602b0 0032f3d8 6053d1c4 00000001 0x0032f184: c0000409 00000001 00000000 60415fa0 0x0032f194: 00000000 6051f145 6053766a 6053d1c4 0x0032f1a4: 00000000 0032f1d8 605378ce 00000001 0x0032f1b4: 6053ae6f 0032f1e8 6053753c 6053add6 0x0032f1c4: 0000005c 0032f83c 6053d1c4 0032f1e8 Backtrace: =>1 0x60416016 RaiseException+0x76(code=3221226505, flags=1, nbargs=0, args=(nil)) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/kernel32/except.c:85] in kernel32 (0x0032f1d8) 2 0x60531cca test_saxstr+0xca(line=281, szStr=(nil), nStr=<register EDI not in topmost frame>, szTest="") [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/tests/../../../include/winnls.h:813] in msxml3_test (0x0032fa28) 3 0x605320e1 contentHandler_startElement+0x41(iface=0x6053da20, pNamespaceUri=(nil), nNamespaceUri=0, pLocalName=0x1296f4, nLocalName=11, pQName=0x12971c, nQName=11, pAttr=0x129744) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/tests/saxreader.c:282] in msxml3_test (0x0032fa38) 4 0x60d46d31 libxmlStartElementNS+0x781(ctx=0x124820, localname="BankAccount", prefix=0x0, URI=0x0, nb_namespaces=0, namespaces=(nil), nb_attributes=0, nb_defaulted=0, attributes=(nil)) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/saxreader.c:1065] in msxml3 (0x0032fad8) 5 0x60da11b1 in libxml2.so.2 (+0x321b1) (0x0032fba8) 6 0x60dab6e0 xmlParseElement+0xa0() in libxml2.so.2 (0x0032fc08) 7 0x60dabd1b xmlParseDocument+0x2ab() in libxml2.so.2 (0x0032fc48) 8 0x60d42181 internal_parseBuffer+0x131(This=<register EDI not in topmost frame>, buffer="<", size=212, vbInterface=0) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/saxreader.c:1672] in msxml3 (0x0032fc88) 9 0x60d4261d internal_parse+0x2fd(This=0x124778, varInput={n1={n2={vt=8, wReserved1=50, wReserved2=39728, wReserved3=24626, n3={cVal=-20, uiVal=38380, ulVal=1218028, intVal=1218028, uintVal=1218028, bVal=-20, iVal=-27156, lVal=1218028, fltVal=0.000000, dblVal=653372038842717154926174532926646266288408872873133910620420354698643182695076070838141136872900174886019390565640505833484670903847518474844878350132969472.000000, boolVal=-27156, scode=1218028, date=653372038842717154926174532926646266288408872873133910620420354698643182695076070838141136872900174886019390565640505833484670903847518474844878350132969472.000000, bstrVal=0x1295ec, cyVal={={Lo=1218028, Hi=1615355272}, int64=6937898064662402540}, punkVal=0x1295ec, pdispVal=0x1295ec, parray=0x1295ec, llVal=6937898064662402540, ullVal=6937898064662402540, pcVal="<", puiVal=0x1295ec, pulVal=0x1295ec, pintVal=0x1295ec, puintVal=0x1295ec, pbVal="<", piVal=0x1295ec, plVal=0x1295ec, pfltVal=0x1295ec, pdblVal=0x1295ec, pboolVal=0x1295ec, pscode=0x1295ec, pdate=0x1295ec, pbstrVal=0x1295ec, pvarVal=0x1295ec, byref=0x1295ec, pcyVal=0x1295ec, pdecVal=0x1295ec, ppunkVal=0x1295ec, ppdispVal=0x1295ec, pparray=0x1295ec, pllVal=0x1295ec, pullVal=0x1295ec, brecVal={pvRecord=0x1295ec, pRecInfo=0x60485d88}}}, decVal={wReserved=8, ={={scale='2', sign=0}, signscale=50}, Hi32=1613929264, ={={Lo32=1218028, Mid32=1615355272}, Lo64=6937898064662402540}}}}, vbInterface=0) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/saxreader.c:1835] in msxml3 (0x0032fd48) 10 0x605316f3 func_saxreader+0x3d3() [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/tests/saxreader.c:523] in msxml3_test (0x0032fdd8) 11 0x605371ca run_test+0x14a(name="saxreader.c") [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/tests/../../../include/wine/test.h:454] in msxml3_test (0x0032fe18) 12 0x60537a29 main+0x149(argc=<register ECX not in topmost frame>, argv=0x1103d8) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/tests/../../../include/wine/test.h:503] in msxml3_test (0x0032fed8) 13 0x60537b9b __wine_spec_exe_entry+0x5b(peb=0x7ffdf000) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/winecrt0/exe_entry.c:36] in msxml3_test (0x0032ff08) 14 0x60447577 start_process+0xc7(arg=(nil)) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/kernel32/process.c:904] in kernel32 (0x0032ffe8) 0x60416016 RaiseException+0x76 [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/kernel32/except.c:85] in kernel32: movl 0xfffffffc(%ebp),%ebx 85 }

2 1