June 2005 - Wine-devel - list.winehq.org

Re: [msvcrt] Implement %I types for printf
by Alexandre Julliard 09 Jun '05

09 Jun '05

Jesse Allen <the3dfxdude(a)gmail.com> writes: > @@ -191,11 +191,14 @@ > } buf; > } pf_output; > > +#define INTEGERSIZE_LONG 1 > +#define INTEGERSIZE_LONGLONG 2 > + > typedef struct pf_flags_t > { > char Sign, LeftAlign, Alternate, PadZero; > char FieldLength, Precision; > - char IntegerLength, IntegerDouble; > + char IntegerLength, IntegerDouble, IntegerSize; The IntegerDouble field was supposed to be used for that already, no need to add another one. > @@ -384,6 +387,16 @@ > sprintf(p, ".%d", flags->Precision); > p += strlen(p); > } > + if( flags->IntegerLength == 'I' ) > + { > + sprintf(p, "l"); > + p++; > + } > + if( flags->IntegerSize == INTEGERSIZE_LONGLONG ) > + { > + sprintf(p, "l"); > + p++; > + } This assumes that the system printf supports %ll formats, that's not portable. -- Alexandre Julliard julliard(a)winehq.org

3 5

Re: MSI: action.c more RegisterProduct work
by Mike McCormack 09 Jun '05

09 Jun '05

Aric Stewart wrote: > @@ -6033,6 +6042,21 @@ > size = strlenW(buffer)*sizeof(WCHAR); > RegSetValueExW(hukey,szProductName,0,REG_SZ, (LPSTR)buffer,size); > HeapFree(GetProcessHeap(),0,buffer); > + > + buffer = load_dynamic_property(package,szProductLanguage,NULL); > + size = sizeof(DWORD); > + langid = atoiW(buffer); > + RegSetValueExW(hukey,szLanguage,0,REG_DWORD, (LPSTR)&langid,size); > + > + buffer = load_dynamic_property(package,szARPProductIcon,NULL); > + if (buffer) > + { > + LPWSTR path; > + build_icon_path(package,buffer,&path); > + size = strlenW(path) * sizeof(WCHAR); > + RegSetValueExW(hukey,szProductIcon,0,REG_SZ, (LPSTR)path,size); > + } > + > FIXME("Need to write more keys to the user registry\n"); > > hDb= alloc_msihandle( &package->db->hdr ); Since load_dynamic_property allocates memory, you leak "buffer" here twice... Mike

1 0

Re: Combine WINE_WAVEOUT and WINE_WAVEIN into single structure
by Robert Reif 08 Jun '05

08 Jun '05

Jeremy White wrote: > This combines the WINE_WAVEOUT and WINE_WAVEIN structures into > a single WINE_WAVECOMMON structure, as most of the fields were > duplicated anyways. This patch should not change any > functionality, but will allow for some elimination > of duplicate code in an upcoming patch. > > (Credit Alexandre for suggestion the combination into a single > structure). > >+} WINE_WAVECOMMON; > > Could you call it WINE_WAVEDEV or WINE_WAVEDEVICE?

1 0

dlls/shell32/shv_item_cmenu.c regression
by Gerald Pfeifer 08 Jun '05

08 Jun '05

After last night's updates, I'm no seeing the following warning in dlls/shell32/shv_item_cmenu.c shv_item_cmenu.c:203: warning: assignment discards qualifiers from pointer target type The last two changes to this file were revision 1.32 date: 2005/06/07 20:30:30; author: julliard; state: Exp; lines: +1 -1 Warning fixes for -Wmissing-declarations and -Wwrite-strings. ---------------------------- revision 1.31 date: 2005/06/06 19:50:36; author: julliard; state: Exp; lines: +3 -3 Make remaining OLE interface vtables const. and I'm pretty sure it's the latter (revision 1.32) which causes this problem. Would you mind fixing this? Thanks, Gerald

1 0

Re: Asynchronous Named Pipes
by Uwe Bonnes 08 Jun '05

08 Jun '05

>>>>> "Robert" == Robert Shearman <rob(a)codeweavers.com> writes: Robert> Hi, This patch depends on "Small RPC Bug Fixes" for the ole32 Robert> tests to pass. I hope people don't think of me as a PITA, but here again my RFT (Request for Tests): Rob, can you please add a testcase in dlls/kernel/tests/pipe.c showing the usage and the functionality of your patch? Thanks -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

2 1

Tests and window versions
by Paul Vriens 08 Jun '05

08 Jun '05

Hi, I've just finished another test for NtQuerySystemInformatio. In this test I test the structure SYSTEM_PROCESS_INFORMATION. The structure is however different for NT4. If I add an osversion (> 4) check I can check the structure for W2K/WinXP and W2K3 and skip this structure-check for NT4 (for now). Wine however defaults to Win98 unless I put in the config: [AppDefaults\\ntdll_test.exe.so\\Version] "Windows" = "winxp" Is there another approach or will this test be accepted as is ? Cheers, Paul.

2 1

Re: [PATCH] FCI work for cabinet.dll [cabinet-fci-patch-02b.diff]
by Alexandre Julliard 08 Jun '05

08 Jun '05

"Gerold J. Wucherpfennig" <gjwucherpfennig(a)gmx.net> writes: > --- dlls/cabinet/cabinet.h 14 May 2005 11:06:10 -0000 1.12 > +++ dlls/cabinet/cabinet.h 8 Jun 2005 14:05:42 -0000 > @@ -89,11 +89,17 @@ typedef UINT32 cab_off_t; > #define cffoldCOMPTYPE_QUANTUM (0x0002) > #define cffoldCOMPTYPE_LZX (0x0003) > #define cfheadPREV_CABINET (0x0001) > +#define cfhdrPREV_CABINET (0x0001) /* original name defined by MS */ > #define cfheadNEXT_CABINET (0x0002) > +#define cfhdrNEXT_CABINET (0x0002) /* original name defined by MS */ > #define cfheadRESERVE_PRESENT (0x0004) > +#define cfhdrRESERVE_PRESENT (0x0004) /* original name defined by MS */ > #define cffileCONTINUED_FROM_PREV (0xFFFD) > +#define ifoldCONTINUED_FROM_PREV (0xFFFD) /* original name defined by MS */ > #define cffileCONTINUED_TO_NEXT (0xFFFE) > +#define ifoldCONTINUED_TO_NEXT (0xFFFE) /* original name defined by MS */ > #define cffileCONTINUED_PREV_AND_NEXT (0xFFFF) > +#define ifoldCONTINUED_PREV_AND_NEXT (0xFFFF) /* original name defined by MS */ If these are the names defined by MS you should get rid of the others, there's no sense in having two different names for the same thing. > --- include/fci.h 28 Aug 2003 21:43:35 -0000 1.3 > +++ include/fci.h 8 Jun 2005 14:05:54 -0000 > @@ -112,15 +113,15 @@ typedef unsigned short TCOMP; > */ > > typedef enum { > - FCIERR_NONE, > - FCIERR_OPEN_SRC, > - FCIERR_READ_SRC, > - FCIERR_ALLOC_FAIL, > - FCIERR_TEMP_FILE, > - FCIERR_BAD_COMPR_TYPE, > - FCIERR_CAB_FILE, > - FCIERR_USER_ABORT, > - FCIERR_MCI_FAIL, > + FCIERROR_NONE, > + FCIERROR_OPEN_SRC, > + FCIERROR_READ_SRC, > + FCIERROR_ALLOC_FAIL, > + FCIERROR_TEMP_FILE, > + FCIERROR_BAD_COMPR_TYPE, > + FCIERROR_CAB_FILE, > + FCIERROR_USER_ABORT, > + FCIERROR_MCI_FAIL, The SDK header uses FCIERR, not FCIERROR. Why are you changing it? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Restructure WINE_WAVEOUT/WINE_WAVEIN
by Alexandre Julliard 08 Jun '05

08 Jun '05

Jeremy White <jwhite(a)codeweavers.com> writes: > @@ -228,12 +205,20 @@ > > /* DirectSound stuff */ > DSDRIVERDESC ds_desc; > - DSCDRIVERCAPS ds_caps; > -} WINE_WAVEIN; > + DSDRIVERCAPS ds_caps; > + > + union { > + WINE_WAVEOUT out; > + WINE_WAVEIN in; > + }; You need to give a name to the union, anonymous unions are not portable. Though considering how few fields remain in the in/out structure you might just as well merge them into the common structure and use a single structure for everything. -- Alexandre Julliard julliard(a)winehq.org

1 0

Known regressions affectiong IE++ remain unfixed?
by René Rebe 08 Jun '05

08 Jun '05

Hi all, I played a bit more with wine the last days and stumbled over this sidenet site which also has some FAQ points: http://sidenet.ddo.jp/winetips/config.html I experienced the same "IE installer crashing" with wine >= 200412xx - I wonder why such a long known regression takes so long to get fixed again. Currently the common way seems to be to install an over half a year old wine just to update it after the IE installation ... Aside from that, keep up your good work! Yours, -- René Rebe - Rubensstr. 64 - 12157 Berlin (Europe / Germany) http://www.exactcode.de | http://www.t2-project.org +49 (0)30 255 897 45

1 0

Re: sysparams: Read the entire logfont from the registry if it's present
by Rein Klazes 08 Jun '05

08 Jun '05

On Wed, 8 Jun 2005 12:32:27 +0100, you wrote: > > /*********************************************************************** > + * reg_get_logfont > + * > + * Tries to retrieve logfont info from the specified key and value > + */ > +static BOOL reg_get_logfont(LPCWSTR key, LPCWSTR value, LOGFONTW *lf) > +{ My guess is that this is not going to work for me. In my user.reg: | "MenuFont"=hex:0c,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,41,72,69,\ | 61,6c,00,40,65,9a,c2,ac,1c,00,01,00,00,00,00,01,00,00,00,6c,f8,56,00,01,00,\ | 00,00,8a,2d IOW it may be stored as a LOGFONT16 (as Win9x does) or a LOGFONTW and maybe a LOGFONTA somewhere as well. Rein..

1 0