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

Re: ntdll: Add stub for LdrResolveDelayLoadedAPI and reference it in kernel32
by Dmitry Timoshkov 10 Jun '13

10 Jun '13

André Hentschel <nerv(a)dawncrow.de> wrote: > diff --git a/include/delayloadhandler.h b/include/delayloadhandler.h > new file mode 100644 > index 0000000..e48e415 > --- /dev/null > +++ b/include/delayloadhandler.h I don't see such file in PSDK 7.1, where does it come from? > diff --git a/include/winnt.h b/include/winnt.h > index 171141e..393f5a7 100644 > --- a/include/winnt.h > +++ b/include/winnt.h > @@ -3052,6 +3052,28 @@ typedef struct _IMAGE_RELOCATION > > #define IMAGE_SIZEOF_RELOCATION 10 > > +typedef struct _IMAGE_DELAYLOAD_DESCRIPTOR > +{ > + union > + { > + DWORD AllAttributes; > + struct > + { > + DWORD RvaBased:1; > + DWORD ReservedAttributes:31; > + }; > + } Attributes; > + > + DWORD DllNameRVA; > + DWORD ModuleHandleRVA; > + DWORD ImportAddressTableRVA; > + DWORD ImportNameTableRVA; > + DWORD BoundImportAddressTableRVA; > + DWORD UnloadInformationTableRVA; > + DWORD TimeDateStamp; > +} IMAGE_DELAYLOAD_DESCRIPTOR, *PIMAGE_DELAYLOAD_DESCRIPTOR; > +typedef const IMAGE_DELAYLOAD_DESCRIPTOR *PCIMAGE_DELAYLOAD_DESCRIPTOR; Same question here about IMAGE_DELAYLOAD_DESCRIPTOR. Besides, the structure contains namesless structure which is not compatible with some compilers and needs to be fixed. -- Dmitry.

3 2

Main sources of Wine complexity
by Ivan 10 Jun '13

10 Jun '13

(short summary: why is emulation of Windows environment so difficult). First of all, my apologies if this is an off-topic question for this list but I hope it will be useful for others in the similar situation. I need to port fairly large WinAPI-heavy application to Linux. After some googling it becomes clear that there's nothing except for Wine/Winelib which is *huge*. However for at least most basic WinAPI functions it looks fairly easy to just re-implement it via Boost/STL/libc/Linux syscalls. Why there's nothing small like this already? Why only Wine with like 3 millions LoC and run-time dependencies? Is the approach described above make some sense for at least most common functionality (threading, IPC, file operations) w/o things like UI, graphics and registry. For instance, we need to either re-implement around 200 WinAPI functions (mostly events, mutexes, semaphore, sockets, file and folder operations) or to rewrite the entire thing from scratch. Using Winelib directly is not an option due to the nature of the app. Any help/advices are greatly appreciated. Thank you.

3 2

re: Main sources of Wine complexity
by Dan Kegel 10 Jun '13

10 Jun '13

>I need to port fairly large WinAPI-heavy application to Linux. After some >googling it becomes clear that there's nothing except for Wine/Winelib >which is *huge*. However for at least most basic WinAPI functions it looks >fairly easy to just re-implement it via Boost/STL/libc/Linux syscalls. Why >there's nothing small like this already? >... we need to either re-implement around >200 WinAPI functions (mostly events, mutexes, semaphore, sockets, file and >folder operations) or to rewrite the entire thing from scratch. Using >Winelib directly is not an option due to the nature of the app. I think there have been several such compatibility layers. http://chiharu.haun.org/peace/ for instance. Wine's the only one that has really tried tor run everything. Why can't you just bundle wine? - Dan

1 0

Re: [PATCH 1/1] wined3d: Explicitly use the C locale for generating shaders.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Henri Verbeet <hverbeet(a)codeweavers.com> writes: > Specifically, we always want to use '.' as decimal separator. Reported on IRC. That's not very portable: x86_64-w64-mingw32-gcc -c -I../../../wine/dlls/wined3d -I. -I../../../wine/include -I../../include -D__WINESRC__ -D_REENTRANT -Wall -pipe -fno-strength-reduce -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wwrite-strings -Wpointer-arith -Wlogical-op -gdwarf-2 -gstrict-dwarf -Wno-format -g -O2 -o glsl_shader.o ../../../wine/dlls/wined3d/glsl_shader.c ../../../wine/dlls/wined3d/glsl_shader.c:92:5: error: unknown type name ‘locale_t’ ../../../wine/dlls/wined3d/glsl_shader.c: In function ‘find_glsl_pshader’: ../../../wine/dlls/wined3d/glsl_shader.c:4695:5: warning: implicit declaration of function ‘uselocale’ [-Wimplicit-function-declaration] ../../../wine/dlls/wined3d/glsl_shader.c:4697:15: error: ‘LC_GLOBAL_LOCALE’ undeclared (first use in this function) ../../../wine/dlls/wined3d/glsl_shader.c:4697:15: note: each undeclared identifier is reported only once for each function it appears in ../../../wine/dlls/wined3d/glsl_shader.c: In function ‘find_glsl_vshader’: ../../../wine/dlls/wined3d/glsl_shader.c:4771:15: error: ‘LC_GLOBAL_LOCALE’ undeclared (first use in this function) ../../../wine/dlls/wined3d/glsl_shader.c: In function ‘find_glsl_geometry_shader’: ../../../wine/dlls/wined3d/glsl_shader.c:4811:15: error: ‘LC_GLOBAL_LOCALE’ undeclared (first use in this function) ../../../wine/dlls/wined3d/glsl_shader.c: In function ‘shader_glsl_find_ffp_vertex_shader’: ../../../wine/dlls/wined3d/glsl_shader.c:5662:15: error: ‘LC_GLOBAL_LOCALE’ undeclared (first use in this function) ../../../wine/dlls/wined3d/glsl_shader.c: In function ‘shader_glsl_find_ffp_fragment_shader’: ../../../wine/dlls/wined3d/glsl_shader.c:5685:15: error: ‘LC_GLOBAL_LOCALE’ undeclared (first use in this function) ../../../wine/dlls/wined3d/glsl_shader.c: In function ‘shader_glsl_alloc’: ../../../wine/dlls/wined3d/glsl_shader.c:6355:5: warning: implicit declaration of function ‘newlocale’ [-Wimplicit-function-declaration] ../../../wine/dlls/wined3d/glsl_shader.c:6355:36: error: ‘LC_ALL_MASK’ undeclared (first use in this function) ../../../wine/dlls/wined3d/glsl_shader.c:6410:9: warning: implicit declaration of function ‘freelocale’ [-Wimplicit-function-declaration] make: *** [glsl_shader.o] Error 1 -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH] ole32: fixed 3 handle leaks (Coverity)
by Dmitry Timoshkov 10 Jun '13

10 Jun '13

Marcus Meissner <marcus(a)jet.franken.de> wrote: > 1030106 Resource leak > 1030105 Resource leak > 1030104 Resource leak These cases are of the kind 'freeing resources at process exit is not useful'. -- Dmitry.

2 4

Re: [PATCH 2/2] d3dxof: Handle float in binary mode and remove code that becomes useless.
by Alexandre Julliard 07 Jun '13

07 Jun '13

Christian Costa <titan.costa(a)gmail.com> writes: > --- > dlls/d3dxof/parsing.c | 20 +++++++++++--------- > 1 file changed, 11 insertions(+), 9 deletions(-) It doesn't work: ../../../tools/runtest -q -P wine -M d3dx9_36.dll -T ../../.. -p d3dx9_36_test.exe.so mesh.c && touch mesh.ok mesh.c:2291: Test failed: Expected E_FAIL, got 0x88760390 mesh.c:2299: Test failed: Expected D3D_OK, got 0x88760390 mesh.c:2323: Test failed: Expected D3D_OK, got 0x88760390 mesh.c:2347: Test failed: Expected D3D_OK, got 0x88760390 mesh.c:2399: Test failed: Expected E_FAIL, got 0x88760390 mesh.c:2403: Test failed: Expected D3D_OK, got 0x88760390 mesh.c:2407: Test failed: Expected D3D_OK, got 0x88760390 mesh.c:2408: Test failed: Expected D3D_OK, got 0x88760390 mesh.c:2409: Test failed: Expected D3D_OK, got 0x88760390 mesh.c:2495: Tests skipped: D3DXCreateBox failed make: *** [mesh.ok] Error 9 -- Alexandre Julliard julliard(a)winehq.org

1 0

joy.cpl icon
by Joel Holdsworth 07 Jun '13

07 Jun '13

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 For some reason, since I send in my icon for joy.cpl, it doesn't appear in the control panel - still only the wine glass fallback icon. Does anyone know why this is? I guess it will be a one line fix. Unfortunately I don't have time do this myself, but if someone has time, I think it would be worth resolving before the release. Best Regards Joel Holdsworth -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJRsFMgAAoJEIsWlGmq62Igf70H/jE97ibCOk2j2BMizaGkGzyW nAGQD0R9E3GXfdnGaUxzn21OPq3cu3/FapiTw1eN5Ns7Ec4b1cBLJ+ana1ElLIrO bz+yYGedqD0bYZq0D80MPE7t9S6jGy7939XGvkNLSMcZVOaBy8E2iroVnAILMNSB w1zbPhDXQGjHjRyBuYHZMhXTPhDz73s8+6JS7lZvCTaMmnF/dzZ6tW7DyTUIBdwx u3zUXn/j4nTNuNw3xGtK5wSYUZdNWxEx8RvQ1JrfuR9CWwLILTfFLB9d7OnSH/Rg 0sxBkjpSkOck25NN9gdQwdud0ERda1JurongrxUSHDXBBxghJ9BIk/gd+ZpP4cQ= =Hnk+ -----END PGP SIGNATURE-----

2 2

Re: wined3d: Add Mobility Radeon HD 4200
by Rico Schüller 06 Jun '13

06 Jun '13

On 30.05.2013 23:51, Kyle Luna wrote: > + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4200M, "ATI Mobility Radeon HD 4200", DRIVER_AMD_R600, 256 }, I think there are versions available which have only 128MB of graphics memory, see: http://de.wikipedia.org/wiki/ATI-Radeon-HD-4000-Serie (de) http://www.notebookcheck.com/ATI-Radeon-HD-4200.20492.0.html (de) I couldn't find this information on the English pages. I'm not sure how much we care about this. Cheers Rico

2 1

Re: user32: Fix icon extraction from non-native PE executables.
by Alexandre Julliard 06 Jun '13

06 Jun '13

Hans Leidekker <hans(a)codeweavers.com> writes: > --- > dlls/user32/exticon.c | 202 ++++++++++++++++++++++++++++++++----------------- > 1 file changed, 133 insertions(+), 69 deletions(-) > > diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c > index 5b9d681..e6e97d5 100644 > --- a/dlls/user32/exticon.c > +++ b/dlls/user32/exticon.c > @@ -251,6 +251,127 @@ static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG > return 0; > } > > +/* caller must make sure we have a PE image */ > +static BOOL get_nt_header( const BYTE *image, const IMAGE_NT_HEADERS32 **nt32, const IMAGE_NT_HEADERS64 **nt64 ) > +{ > + const IMAGE_DOS_HEADER *dos = (const IMAGE_DOS_HEADER *)image; > + const IMAGE_NT_HEADERS *nt = (const IMAGE_NT_HEADERS *)(image + dos->e_lfanew); > + > + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) > + { > + *nt32 = (const IMAGE_NT_HEADERS32 *)nt; > + *nt64 = NULL; > + return TRUE; > + } > + else if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) > + { > + *nt64 = (const IMAGE_NT_HEADERS64 *)nt; > + *nt32 = NULL; > + return TRUE; > + } > + return FALSE; > +} > + > +static const IMAGE_SECTION_HEADER *get_next_section_header( const BYTE *image, WORD *index ) > +{ > + const IMAGE_NT_HEADERS32 *hdr32; > + const IMAGE_NT_HEADERS64 *hdr64; > + const IMAGE_SECTION_HEADER *section = NULL; > + > + if (!get_nt_header( image, &hdr32, &hdr64 )) return NULL; > + if (hdr32) > + { > + if (*index >= hdr32->FileHeader.NumberOfSections) return NULL; > + section = (const IMAGE_SECTION_HEADER *)((char *)hdr32 + sizeof(DWORD) + > + sizeof(IMAGE_FILE_HEADER) + hdr32->FileHeader.SizeOfOptionalHeader + > + *index * sizeof(IMAGE_SECTION_HEADER)); > + } > + else > + { > + if (*index >= hdr64->FileHeader.NumberOfSections) return NULL; > + section = (const IMAGE_SECTION_HEADER *)((char *)hdr64 + sizeof(DWORD) + > + sizeof(IMAGE_FILE_HEADER) + hdr64->FileHeader.SizeOfOptionalHeader + > + *index * sizeof(IMAGE_SECTION_HEADER)); > + } > + if (section) (*index)++; > + return section; > +} You probably want to use RtlImageDirectoryEntryToData and friends instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: cmd: Disable Ctrl-C interrupt
by Jason Edmeades 06 Jun '13

06 Jun '13

Hi Hugh, Thanks for looking at this issue with wine's cmd I do not think this patch is enough - From memory (I once tried something similar) the problem with resolving it the way you have is you then lose the ability of breaking out of a batch program. I think the right solution needs an actual handler which resets back to the command prompt mode, optionally asking something like whether you want to end the program or not (with a no continuing from where it left off, with consideration around for loops etc!). I would suggest it's better to allow control c for now rather than get into situations you cannot terminate Jason

2 1