July 2010 - Wine-devel - list.winehq.org

Re: kernel32: make wine_get_dos_file_name independent from drive mappings
by Alexandre Julliard 21 Jul '10

21 Jul '10

Damjan Jovanovic <damjan.jov(a)gmail.com> writes: > Changelog: > * kernel32: make wine_get_dos_file_name independent from drive mappings > > ... by returning \\?\unix/home/user/path/to/file.txt style paths. That should actually be done in wine_unix_to_nt_file_name, and only when there is no suitable DOS drive. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32.dll: implementation of GetVolumePathNamesForVolumeNameA/W (try 2)
by Vitaliy Margolen 21 Jul '10

21 Jul '10

Thanks for the patch. However it has number of issues: On 07/20/2010 08:33 PM, Tuomo Mattila wrote: > @ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) > @ stdcall GetVolumePathNameA(str ptr long) > @ stdcall GetVolumePathNameW(wstr ptr long) > -# @ stub GetVolumePathNamesForVolumeNameA > +@ stdcall GetVolumePathNamesForVolumeNameA(str ptr long ptr) Broken formatting. > + /* FIXME: The winxp version of this function raises an exception (access violation) if called with a NULL volumename or volumepathname argument. Alternatively, we might want to set an error code and return a failure */ > +/* > + if (volumename == NULL || volumepathname == NULL) That indicates that you shouldn't be doing any null checks here. Commented out code is not accepted into Wine. Also please don't use such long lines, especially comments. leek > + { > + return FALSE; > + } > +*/ > + > + volumepathnameW = HeapAlloc(GetProcessHeap(), 0, buflen*sizeof(WCHAR)); > + if (volumepathnameW == NULL) return FALSE; This should probably set LastError as well. Need a test to verify. > + > + if ((volumenameW = FILE_name_AtoW(volumename, TRUE)) == 0) return FALSE; You leaking volumepathnameW here. > + WCHAR volumename2string[50]; > + LPWSTR volumename2 = volumename2string; Don't do that. Unless you need to do some extra pointer arithmetic don't create extra pointer that points to a buffer. > - FIXME("(%s, %p, %d, %p), stub!\n", debugstr_w(volumename), volumepathname, buflen, returnlen); You should replace FIXME with appropriate TRACE. > + if (strncmpW(volumename, volname_prefix, 11) != 0 || volumename[19] != '-' || volumename[24] != '-' || volumename[29] != '-' || volumename[34] != '-' || volumename[47] != '}') You are not checking the length of the volumename. If it's too short you accessing it past the end. Also comment about what exactly you are looking for and how volume string is supposed to look like will be good. > + /* FIXME: combination of the above may set other error codes */ Such as? Need a test for that. > + memset(volumename2string, 0, sizeof(volumename2string)); Don't do this sort of thing. There is never a need to clear the entire buffer, especially on each iteration. > + if (available_drives& (1<<(letter-'A'))) > + { > + pstr[0] = letter; > + if( (GetVolumeNameForVolumeMountPointW(pathstring, volumename2, 50))&& (!strncmpW(volumename, volumename2, 50))) Don't use magic numbers. Always use sizeof() when need a buffer size. And as I said before you should use volumename2string directly here. Vitaliy.

1 0

Re: [4/6] shdocvw: Add About dialog to IE
by Jacek Caban 21 Jul '10

21 Jul '10

On 7/21/10 2:09 PM, Alexander Nicolaysen Sørnes wrote: > Add About dialog to IE > +static void ie_dialog_about(HWND hwnd) +{ + HICON icon = LoadImageW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 48, 48, LR_SHARED); + + ShellAboutW(hwnd, wszWineInternetExplorer, NULL, icon); +} You leak icon here. Jacek

1 0

Re: [1/2] shlwapi: Partially implement SHGetShellKey (try2)
by testbot＠testbot.winehq.org 21 Jul '10

21 Jul '10

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=3649 Your paranoid android. === W2KPROSP4 (32 bit ordinal) === ordinal.c:595: Test failed: GetShellSecurityDescriptor should fail ordinal.c:618: Test failed: returned value is not valid SD No test summary line found === WVISTAADM (32 bit ordinal) === No test summary line found === W7PRO (32 bit ordinal) === ordinal.c:1768: Test failed: got 28 ordinal.c:1818: Test failed: got 28 ordinal.c:1826: Test failed: got 28 ordinal.c:1834: Test failed: got 39, length 40 ordinal.c:1845: Test failed: got 42 === W7PROX64 (32 bit ordinal) === ordinal.c:1768: Test failed: got 25 ordinal.c:1818: Test failed: got 25 ordinal.c:1826: Test failed: got 25 ordinal.c:1834: Test failed: got 34, length 35 ordinal.c:1845: Test failed: got 37 === W7PROX64 (64 bit ordinal) === ordinal.c:1762: Test failed: got 10 ordinal.c:1783: Test failed: got 7 ordinal.c:1796: Test failed: got 10 ordinal.c:1804: Test failed: got 10 ordinal.c:1834: Test failed: got 34, length 35 ordinal.c:1845: Test failed: got 37 ordinal.c:1856: Test failed: got 20 ordinal.c:1867: Test failed: got 23

1 0

Re: [1/6] shdocvw: Add menu bar to Internet Explorer
by Jacek Caban 21 Jul '10

21 Jul '10

Hi Alexander, On 7/21/10 2:07 PM, Alexander Nicolaysen Sørnes wrote: > This series adds a menu bar and Open URL dialog box to Wine's IE. - FIXME("(%p)->(%x)\n", This, Value); - return E_NOTIMPL; + HMENU hMenu = NULL; Please use better names (without type prefix) like 'menu'. + + TRACE("(%p)->(%x)\n", This, Value); + + if(Value == VARIANT_TRUE) You shouldn't compare Value directly to VARIANT_TRUE. + hMenu = LoadMenuW(shdocvw_hinstance, MAKEINTRESOURCEW(IDR_BROWSE_MAIN_MENU)); + + if(!SetMenu(This->frame_hwnd, hMenu)) + return HRESULT_FROM_WIN32(GetLastError()); + + + return S_OK; You leak hMenu here. Jacek

1 0

Re: dmusic: remove unused variable
by Nikolay Sivov 21 Jul '10

21 Jul '10

On 7/21/2010 08:31, Austin English wrote: > HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) { > IDirectMusicPortImpl *obj; > - HRESULT hr = E_FAIL; > UINT j; > > TRACE("(%p,%p,%p)\n", lpcGUID, ppobj, pUnkOuter); > @@ -381,7 +380,6 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, > obj->caps = *pPortCaps; > obj->pDirectSound = NULL; > obj->pLatencyClock = NULL; > - hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&obj->pLatencyClock, NULL); > > if(0) > { I doubt you could remove a call here. And probably return value should be used to exit earlier on a failure.

3 3

Re: [PATCH 4/7] msvcp90: Added char_traits<unsigned short> implementation (try3)
by Paul Vriens 21 Jul '10

21 Jul '10

(Forgot to cc: wine-devel). On 07/21/2010 11:10 AM, Piotr Caban wrote: > +void CDECL MSVCP_char_trauts_short_assign(unsigned short *ch, ^ I guess his should have been "MSVCP_char_traits_short_assign" -- Cheers, Paul.

1 0

Re: [1\4]wined3d: Extend IWineD3D_GetAdapterDisplayMode with an extra paramater to pass back some extra adapter info.
by Henri Verbeet 21 Jul '10

21 Jul '10

On 20 July 2010 23:25, Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> wrote: > +struct wined3d_adapter_info_ex > +{ > + WINED3DSCANLINEORDERING ScanLineOrdering; > + WINED3DDISPLAYROTATION Rotation; > +}; You can at least add the scanline ordering to WINED3DDISPLAYMODE, it doesn't need to be compatible with D3DDISPLAYMODE. I guess the reason the rotation is separate in d3d9ex is because it doesn't make much sense for enumerations like e.g. EnumAdapterModesEx(), so keeping that one separate makes sense. I also think the wined3d call should simply retrieve all info, d3d9ex can discard it again if it feels like it.

1 0

Re: [PATCH 4/7] msvcp90: Added char_traits<unsigned short> implementation (try2)
by Alexandre Julliard 21 Jul '10

21 Jul '10

Piotr Caban <piotr(a)codeweavers.com> writes: > +/* ?not_eof@?$char_traits(a)G@std@@SAGABG(a)Z */ > +unsigned short CDECL MSVCP_char_traits_short_not_eof(const unsigned short *in) > +{ > + return (*in==0 ? !0 : *in); > +} Aren't you supposed to return 0 for eof? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [7/8] msi/tests: Double null-terminate a REG_MULTI_SZ string.
by testbot＠testbot.winehq.org 21 Jul '10

21 Jul '10

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=3642 Your paranoid android. === W7PROX64 (32 bit msi) === msi.c:2129: Test failed: Expected {199806F7-4914-4AD4-A534-621BD19AB132}, got prod msi.c:2147: Test failed: Expected {199806F7-4914-4AD4-A534-621BD19AB132}, got prod msi.c:2162: Test failed: Expected {199806F7-4914-4AD4-A534-621BD19AB132}, got prod msi.c:2177: Test failed: Expected {199806F7-4914-4AD4-A534-621BD19AB132}, got prod msi.c:2195: Test failed: Expected {B88234A0-3235-44D6-9896-5C2F4FECBCA3}, got prod msi.c:2224: Test failed: Expected {199806F7-4914-4AD4-A534-621BD19AB132}, got prod msi.c:2242: Test failed: Expected {199806F7-4914-4AD4-A534-621BD19AB132}, got prod msi.c:2257: Test failed: Expected {199806F7-4914-4AD4-A534-621BD19AB132}, got prod msi.c:2272: Test failed: Expected {199806F7-4914-4AD4-A534-621BD19AB132}, got prod msi.c:2290: Test failed: Expected {B88234A0-3235-44D6-9896-5C2F4FECBCA3}, got prod msi.c:2371: Test failed: Expected {B7AD5430-68AC-40AC-A2B7-AC3921BEC0BB}, got msi.c:2377: Test failed: Expected {B7AD5430-68AC-40AC-A2B7-AC3921BEC0BB}, got msi.c:2401: Test failed: Expected {B7AD5430-68AC-40AC-A2B7-AC3921BEC0BB} or {585F89C0-75DE-4B38-8A34-5B7E4D13554C}, got msi.c:2408: Test failed: Expected {B7AD5430-68AC-40AC-A2B7-AC3921BEC0BB} or {585F89C0-75DE-4B38-8A34-5B7E4D13554C}, got msi.c:2442: Test failed: Expected {B7AD5430-68AC-40AC-A2B7-AC3921BEC0BB}, got msi.c:2471: Test failed: Expected {B7AD5430-68AC-40AC-A2B7-AC3921BEC0BB} or {585F89C0-75DE-4B38-8A34-5B7E4D13554C}, got msi.c:2478: Test failed: Expected {B7AD5430-68AC-40AC-A2B7-AC3921BEC0BB} or {585F89C0-75DE-4B38-8A34-5B7E4D13554C}, got msi.c:7467: Test failed: Expected "{C3232306-263D-4B13-8407-D7D348E8AAAC}", got "C:\winetest\\winetest.msi" msi.c:7536: Test failed: Expected "{C3232306-263D-4B13-8407-D7D348E8AAAC}", got "C:\winetest\\winetest.msi" msi.c:7603: Test failed: Expected "{C3232306-263D-4B13-8407-D7D348E8AAAC}", got "C:\winetest\\winetest.msi" msi.c:7827: Test failed: Expected "{3E071142-9810-482F-A3BC-307835CE5064}", got "apple" msi.c:7829: Test failed: Expected "{AFCF83EE-1910-4D2B-9431-E5D213087128}", got "banana" msi.c:7888: Test failed: Expected "{AFCF83EE-1910-4D2B-9431-E5D213087128}", got "banana" msi.c:7906: Test failed: Expected "{3E071142-9810-482F-A3BC-307835CE5064}", got "apple" msi.c:7924: Test failed: Expected "{3E071142-9810-482F-A3BC-307835CE5064}", got "apple" msi.c:7926: Test failed: Expected "{AFCF83EE-1910-4D2B-9431-E5D213087128}", got "banana" msi.c:7942: Test failed: Expected "{3E071142-9810-482F-A3BC-307835CE5064}", got "apple" msi.c:7944: Test failed: Expected "{AFCF83EE-1910-4D2B-9431-E5D213087128}", got "banana" msi.c:7961: Test failed: Expected "{3E071142-9810-482F-A3BC-307835CE5064}", got "apple" msi.c:7963: Test failed: Expected "{AFCF83EE-1910-4D2B-9431-E5D213087128}", got "banana" msi.c:7982: Test failed: Expected "{3E071142-9810-482F-A3BC-307835CE5064}", got "apple" msi.c:7984: Test failed: Expected "{AFCF83EE-1910-4D2B-9431-E5D213087128}", got "banana" msi.c:8001: Test failed: Expected "{3E071142-9810-482F-A3BC-307835CE5064}", got "apple" msi.c:8003: Test failed: Expected "{AFCF83EE-1910-4D2B-9431-E5D213087128}", got "banana" msi.c:8119: Test failed: Expected "{3E071142-9810-482F-A3BC-307835CE5064}", got "apple" msi.c:8121: Test failed: Expected "{AFCF83EE-1910-4D2B-9431-E5D213087128}", got "banana" msi.c:8166: Test failed: Expected "{3E071142-9810-482F-A3BC-307835CE5064}", got "apple" msi.c:8168: Test failed: Expected "{AFCF83EE-1910-4D2B-9431-E5D213087128}", got "banana" msi.c:8192: Test failed: Expected "{3E071142-9810-482F-A3BC-307835CE5064}", got "apple" msi.c:8194: Test failed: Expected "{AFCF83EE-1910-4D2B-9431-E5D213087128}", got "banana" msi.c:7827: Test failed: Expected "{C6C5E819-A8C9-472A-A6C4-0B25C4BE950C}", got "apple" msi.c:7829: Test failed: Expected "{19FD8C6F-AF94-4735-B9F4-CB6E80553C15}", got "banana" msi.c:7888: Test failed: Expected "{19FD8C6F-AF94-4735-B9F4-CB6E80553C15}", got "banana" msi.c:7906: Test failed: Expected "{C6C5E819-A8C9-472A-A6C4-0B25C4BE950C}", got "apple" msi.c:7924: Test failed: Expected "{C6C5E819-A8C9-472A-A6C4-0B25C4BE950C}", got "apple" msi.c:7926: Test failed: Expected "{19FD8C6F-AF94-4735-B9F4-CB6E80553C15}", got "banana" msi.c:7942: Test failed: Expected "{C6C5E819-A8C9-472A-A6C4-0B25C4BE950C}", got "apple" msi.c:7944: Test failed: Expected "{19FD8C6F-AF94-4735-B9F4-CB6E80553C15}", got "banana" msi.c:7961: Test failed: Expected "{C6C5E819-A8C9-472A-A6C4-0B25C4BE950C}", got "apple" msi.c:7963: Test failed: Expected "{19FD8C6F-AF94-4735-B9F4-CB6E80553C15}", got "banana" msi.c:7982: Test failed: Expected "{C6C5E819-A8C9-472A-A6C4-0B25C4BE950C}", got "apple" msi.c:7984: Test failed: Expected "{19FD8C6F-AF94-4735-B9F4-CB6E80553C15}", got "banana" msi.c:8001: Test failed: Expected "{C6C5E819-A8C9-472A-A6C4-0B25C4BE950C}", got "apple" msi.c:8003: Test failed: Expected "{19FD8C6F-AF94-4735-B9F4-CB6E80553C15}", got "banana" msi.c:8119: Test failed: Expected "{C6C5E819-A8C9-472A-A6C4-0B25C4BE950C}", got "apple" msi.c:8121: Test failed: Expected "{19FD8C6F-AF94-4735-B9F4-CB6E80553C15}", got "banana" msi.c:8166: Test failed: Expected "{C6C5E819-A8C9-472A-A6C4-0B25C4BE950C}", got "apple" msi.c:8168: Test failed: Expected "{19FD8C6F-AF94-4735-B9F4-CB6E80553C15}", got "banana" msi.c:8192: Test failed: Expected "{C6C5E819-A8C9-472A-A6C4-0B25C4BE950C}", got "apple" msi.c:8194: Test failed: Expected "{19FD8C6F-AF94-4735-B9F4-CB6E80553C15}", got "banana" msi.c:7827: Test failed: Expected "{45A5585C-BBBF-4370-8B8B-2A47AFB6085F}", got "apple" msi.c:7829: Test failed: Expected "{DD02D28F-89E8-4870-B935-0A8BCE2DAB81}", got "banana" msi.c:7888: Test failed: Expected "{DD02D28F-89E8-4870-B935-0A8BCE2DAB81}", got "banana" msi.c:7906: Test failed: Expected "{45A5585C-BBBF-4370-8B8B-2A47AFB6085F}", got "apple" msi.c:7924: Test failed: Expected "{45A5585C-BBBF-4370-8B8B-2A47AFB6085F}", got "apple" msi.c:7926: Test failed: Expected "{DD02D28F-89E8-4870-B935-0A8BCE2DAB81}", got "banana" msi.c:7942: Test failed: Expected "{45A5585C-BBBF-4370-8B8B-2A47AFB6085F}", got "apple" msi.c:7944: Test failed: Expected "{DD02D28F-89E8-4870-B935-0A8BCE2DAB81}", got "banana" msi.c:7961: Test failed: Expected "{45A5585C-BBBF-4370-8B8B-2A47AFB6085F}", got "apple" msi.c:7963: Test failed: Expected "{DD02D28F-89E8-4870-B935-0A8BCE2DAB81}", got "banana" msi.c:7982: Test failed: Expected "{45A5585C-BBBF-4370-8B8B-2A47AFB6085F}", got "apple" msi.c:7984: Test failed: Expected "{DD02D28F-89E8-4870-B935-0A8BCE2DAB81}", got "banana" msi.c:8001: Test failed: Expected "{45A5585C-BBBF-4370-8B8B-2A47AFB6085F}", got "apple" msi.c:8003: Test failed: Expected "{DD02D28F-89E8-4870-B935-0A8BCE2DAB81}", got "banana" msi.c:8119: Test failed: Expected "{45A5585C-BBBF-4370-8B8B-2A47AFB6085F}", got "apple" msi.c:8121: Test failed: Expected "{DD02D28F-89E8-4870-B935-0A8BCE2DAB81}", got "banana" msi.c:8166: Test failed: Expected "{45A5585C-BBBF-4370-8B8B-2A47AFB6085F}", got "apple" msi.c:8168: Test failed: Expected "{DD02D28F-89E8-4870-B935-0A8BCE2DAB81}", got "banana" msi.c:8192: Test failed: Expected "{45A5585C-BBBF-4370-8B8B-2A47AFB6085F}", got "apple" msi.c:8194: Test failed: Expected "{DD02D28F-89E8-4870-B935-0A8BCE2DAB81}", got "banana" msi.c:8446: Test failed: Expected "{04E77E6E-BA67-4A5E-90F3-C9B4299BA046}", got "apple" msi.c:8448: Test failed: Expected "{1BBD0F20-AAFC-4501-9FF9-AF6193A9DCA1}", got "banana" msi.c:8568: Test failed: Expected "{04E77E6E-BA67-4A5E-90F3-C9B4299BA046}", got "apple" msi.c:8570: Test failed: Expected "{1BBD0F20-AAFC-4501-9FF9-AF6193A9DCA1}", got "banana" msi.c:8615: Test failed: Expected "{04E77E6E-BA67-4A5E-90F3-C9B4299BA046}", got "apple" msi.c:8617: Test failed: Expected "{1BBD0F20-AAFC-4501-9FF9-AF6193A9DCA1}", got "banana" msi.c:8641: Test failed: Expected "{04E77E6E-BA67-4A5E-90F3-C9B4299BA046}", got "apple" msi.c:8643: Test failed: Expected "{1BBD0F20-AAFC-4501-9FF9-AF6193A9DCA1}", got "banana" msi.c:8446: Test failed: Expected "{D9AB86F5-8CB4-4B0C-ABB7-537444F6E35F}", got "apple" msi.c:8448: Test failed: Expected "{912A7620-4EBD-4231-85EE-AB96CF738149}", got "banana" msi.c:8568: Test failed: Expected "{D9AB86F5-8CB4-4B0C-ABB7-537444F6E35F}", got "apple" msi.c:8570: Test failed: Expected "{912A7620-4EBD-4231-85EE-AB96CF738149}", got "banana" msi.c:8615: Test failed: Expected "{D9AB86F5-8CB4-4B0C-ABB7-537444F6E35F}", got "apple" msi.c:8617: Test failed: Expected "{912A7620-4EBD-4231-85EE-AB96CF738149}", got "banana" msi.c:8641: Test failed: Expected "{D9AB86F5-8CB4-4B0C-ABB7-537444F6E35F}", got "apple" msi.c:8643: Test failed: Expected "{912A7620-4EBD-4231-85EE-AB96CF738149}", got "banana" msi.c:8938: Test failed: Expected patchcode to be unchanged, got {CF399255-56B3-4687-A3A0-7F251EA1CADD} msi.c:8940: Test failed: Expected targetprod to be unchanged, got {17BDACDF-1FCC-4FAB-89DF-428846E3A7D7} msi.c:9009: Test failed: Expected "{CF399255-56B3-4687-A3A0-7F251EA1CADD}", got "apple" msi.c:9011: Test failed: Expected "{17BDACDF-1FCC-4FAB-89DF-428846E3A7D7}", got "banana" msi.c:9054: Test failed: Expected "{CF399255-56B3-4687-A3A0-7F251EA1CADD}", got "apple" msi.c:9056: Test failed: Expected "{17BDACDF-1FCC-4FAB-89DF-428846E3A7D7}", got "banana" msi.c:9600: Test failed: Expected "{6043D85C-0E7F-4F78-9F6F-8FB0D4D9C7C7}", got "apple" msi.c:9643: Test failed: Expected "{6043D85C-0E7F-4F78-9F6F-8FB0D4D9C7C7}", got "apple" msi.c:9820: Test failed: Expected "{6043D85C-0E7F-4F78-9F6F-8FB0D4D9C7C7}", got "apple"

1 0