April 2013 - Wine-Commits - list.winehq.org

André Hentschel : hid: Add HidD_GetManufacturerString stub.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: 4b98d78951d4700aa39ace6f828f2d061bab3dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b98d78951d4700aa39ace6f8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 3 18:09:21 2013 +0200 hid: Add HidD_GetManufacturerString stub. --- dlls/hid/hid.spec | 2 +- dlls/hid/main.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index b75b6b0..af6140a 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -6,7 +6,7 @@ @ stdcall HidD_GetHidGuid(ptr) @ stub HidD_GetIndexedString @ stub HidD_GetInputReport -@ stub HidD_GetManufacturerString +@ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor @ stub HidD_GetNumInputBuffers @ stub HidD_GetPhysicalDescriptor diff --git a/dlls/hid/main.c b/dlls/hid/main.c index 1b9d7eb..ed85f00 100644 --- a/dlls/hid/main.c +++ b/dlls/hid/main.c @@ -64,6 +64,12 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) *guid = HID_GUID; } +BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) +{ + FIXME("(%p %p %u) stub\n", HidDeviceObject, Buffer, BufferLength); + return FALSE; +} + BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index a6bc45c..229fc14 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -29,6 +29,7 @@ typedef LONG NTSTATUS; BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); +BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); #endif /* __WINE_HIDSDI_H */

1 0

Ken Thomases : winemac: Add a delivery limit to events.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: ca2d7140fb6f183f7924767afddddd7557c1dc05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2d7140fb6f183f7924767af… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 3 18:56:41 2013 -0500 winemac: Add a delivery limit to events. Some events are application-wide, not specific to a thread. Such an event needs to be broadcast to all GUI-attached threads because we don't know which are handling events, but we don't want the event to be processed in each. Often it should only be processed by the first to pull it from its queue. --- dlls/winemac.drv/cocoa_app.m | 7 +++++++ dlls/winemac.drv/cocoa_event.m | 30 ++++++++++++++++++------------ dlls/winemac.drv/macdrv_cocoa.h | 1 + 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index e0a29ee..afb290f 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -413,6 +413,13 @@ int macdrv_err_on; event->displays_changed.activating = activating; [eventQueuesLock lock]; + + // If we're activating, then we just need one of our threads to get the + // event, so it can send it directly to the desktop window. Otherwise, + // we need all of the threads to get it because we don't know which owns + // the desktop window and only that one will do anything with it. + if (activating) event->deliver = 1; + for (queue in eventQueues) [queue postEvent:event]; [eventQueuesLock unlock]; diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 78a2f94..366aa46 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -198,7 +198,7 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea char buf[512]; int rc; NSUInteger index; - MacDrvEvent* event; + MacDrvEvent* ret = nil; /* Clear the pipe which signals there are pending events. */ do @@ -217,22 +217,27 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea [eventsLock lock]; index = 0; - for (event in events) + while (index < [events count]) { + MacDrvEvent* event = [events objectAtIndex:index]; if (event_mask_for_type(event->event->type) & mask) - break; - - index++; - } - - if (event) - { - [event retain]; - [events removeObjectAtIndex:index]; + { + [[event retain] autorelease]; + [events removeObjectAtIndex:index]; + + if (event->event->deliver == INT_MAX || + OSAtomicDecrement32Barrier(&event->event->deliver) >= 0) + { + ret = event; + break; + } + } + else + index++; } [eventsLock unlock]; - return [event autorelease]; + return ret; } - (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window @@ -416,6 +421,7 @@ macdrv_event* macdrv_create_event(int type, WineWindow* window) event = calloc(1, sizeof(*event)); event->refs = 1; + event->deliver = INT_MAX; event->type = type; event->window = (macdrv_window)[window retain]; return event; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index c12545a..ae11b32 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -176,6 +176,7 @@ typedef uint32_t macdrv_event_mask; typedef struct macdrv_event { int refs; + int deliver; int type; macdrv_window window; union {

1 0

Ken Thomases : winemac: Handle a Cocoa quit request as a single-process session shutdown.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: fd1e187ac7a2c2f2300c4c8bb4114daa118bd6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1e187ac7a2c2f2300c4c8bb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 3 18:56:55 2013 -0500 winemac: Handle a Cocoa quit request as a single-process session shutdown. This lets programs ask the user to save documents, etc., and possibly cancel the quit. --- dlls/winemac.drv/cocoa_app.m | 53 ++++++++++++ dlls/winemac.drv/event.c | 8 ++- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 12 +++ dlls/winemac.drv/window.c | 167 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 240 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd1e187ac7a2c2f2300c4…

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlay3.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: ac0368e800b2c96946ea991cd682693ead0f5037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0368e800b2c96946ea991cd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:15:57 2013 +0100 dplayx: Add a separate refcount for IDirectPlay3. --- dlls/dplayx/dplay.c | 409 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 411 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac0368e800b2c96946ea9…

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlay3A.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: 36dccf839a9432196da94be100e4ee15604ecd54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36dccf839a9432196da94be10… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:15:01 2013 +0100 dplayx: Add a separate refcount for IDirectPlay3A. --- dlls/dplayx/dplay.c | 409 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 411 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36dccf839a9432196da94…

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlay2.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: 9378c4182f6b4f1f4db5e6538eb36e24e4728aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9378c4182f6b4f1f4db5e6538… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:14:07 2013 +0100 dplayx: Add a separate refcount for IDirectPlay2. --- dlls/dplayx/dplay.c | 282 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 284 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9378c4182f6b4f1f4db5e…

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlay2A.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: cf894d4c0d4a7acc30ef8d009db40e9b066ecd7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf894d4c0d4a7acc30ef8d009… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:13:11 2013 +0100 dplayx: Add a separate refcount for IDirectPlay2A. --- dlls/dplayx/dplay.c | 282 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 284 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf894d4c0d4a7acc30ef8…

1 0

Alexandre Julliard : ntdll: Set the address space limit before running application code.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: cd03a51e7ddcafb3cf98b6c1dd5469bb92b8adcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd03a51e7ddcafb3cf98b6c1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 4 13:00:47 2013 +0200 ntdll: Set the address space limit before running application code. --- dlls/ntdll/loader.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 3 ++- dlls/ntdll/virtual.c | 30 +++++++++++++++++++++++------- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 28ed9f4..271907f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2703,7 +2703,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, WINE_MODREF *wm; LPCWSTR load_path; PEB *peb = NtCurrentTeb()->Peb; - IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress ); if (main_exe_file) NtClose( main_exe_file ); /* at this point the main module is created */ @@ -2721,6 +2720,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, if (!peb->ProcessParameters->WindowTitle.Buffer) peb->ProcessParameters->WindowTitle = wm->ldr.FullDllName; version_init( wm->ldr.FullDllName.Buffer ); + virtual_set_large_address_space(); LdrQueryImageFileExecutionOptions( &peb->ProcessParameters->ImagePathName, globalflagW, REG_DWORD, &peb->NtGlobalFlag, sizeof(peb->NtGlobalFlag), NULL ); @@ -2742,7 +2742,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); if (status != STATUS_SUCCESS) goto error; - virtual_release_address_space( nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE ); + virtual_release_address_space(); virtual_clear_thread_stack(); wine_switch_to_stack( start_process, kernel_start, NtCurrentTeb()->Tib.StackBase ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index b4f7dbd..146ce50 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -171,7 +171,8 @@ extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern void VIRTUAL_SetForceExec( BOOL enable ) DECLSPEC_HIDDEN; -extern void virtual_release_address_space( BOOL free_high_mem ) DECLSPEC_HIDDEN; +extern void virtual_release_address_space(void) DECLSPEC_HIDDEN; +extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; /* completion */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a99bca4..7a07128 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1815,22 +1815,21 @@ static int free_reserved_memory( void *base, size_t size, void *arg ) * * Release some address space once we have loaded and initialized the app. */ -void virtual_release_address_space( BOOL free_high_mem ) +void virtual_release_address_space(void) { struct free_range range; sigset_t sigset; - if (user_space_limit == address_space_limit) return; /* no need to free anything */ + if (is_win64) return; server_enter_uninterrupted_section( &csVirtual, &sigset ); - /* no large address space on win9x */ - if (free_high_mem && NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32_NT) + range.base = (char *)0x82000000; + range.limit = user_space_limit; + + if (range.limit > range.base) { - range.base = (char *)0x82000000; - range.limit = address_space_limit; while (wine_mmap_enum_reserved_areas( free_reserved_memory, &range, 1 )) /* nothing */; - user_space_limit = working_set_limit = address_space_limit; } else { @@ -1846,6 +1845,23 @@ void virtual_release_address_space( BOOL free_high_mem ) /*********************************************************************** + * virtual_set_large_address_space + * + * Enable use of a large address space when allowed by the application. + */ +void virtual_set_large_address_space(void) +{ + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + + if (!(nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE)) return; + /* no large address space on win9x */ + if (NtCurrentTeb()->Peb->OSPlatformId != VER_PLATFORM_WIN32_NT) return; + + user_space_limit = working_set_limit = address_space_limit; +} + + +/*********************************************************************** * NtAllocateVirtualMemory (NTDLL.@) * ZwAllocateVirtualMemory (NTDLL.@) */

1 0

Joel Holdsworth : joy.cpl: Added a Tango compliant icon.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: 4e25cd462e8e5830a597ae56c4b1ae404f4c80e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e25cd462e8e5830a597ae56c… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sat Jun 9 10:26:09 2012 +0100 joy.cpl: Added a Tango compliant icon. --- dlls/joy.cpl/Makefile.in | 3 + dlls/joy.cpl/joy.ico | Bin 0 -> 25214 bytes dlls/joy.cpl/joy.rc | 3 + dlls/joy.cpl/joy.svg | 265 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 271 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e25cd462e8e5830a597a…

1 0

André Hentschel : winedev: Update opengl chapter.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: docs Branch: master Commit: fb7b36cca4cfcc40d299569d686d4ec7dea1b46e URL: http://source.winehq.org/git/docs.git/?a=commit;h=fb7b36cca4cfcc40d299569d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 4 02:46:10 2013 +0200 winedev: Update opengl chapter. --- en/winedev-opengl.sgml | 28 ++++------------------------ 1 files changed, 4 insertions(+), 24 deletions(-) diff --git a/en/winedev-opengl.sgml b/en/winedev-opengl.sgml index d26b742..c953e96 100644 --- a/en/winedev-opengl.sgml +++ b/en/winedev-opengl.sgml @@ -136,10 +136,7 @@ choosing if one wants a depth / alpha buffer, the size of these buffers, ...) and to do the 'page flipping' in double buffer mode. This is implemented in - <filename>dlls/x11drv/opengl.c</filename> (all these - functions are part of Wine's graphic driver function - pointer table and thus could be reimplemented if ever Wine - works on another Windowing system than X). + <filename>dlls/winex11.drv/opengl.c</filename>. </para> </listitem> <listitem> @@ -222,23 +219,6 @@ <title>Known problems</title> <sect2> - <title>When running an OpenGL application, the screen flickers</title> - - <para> - Due to restrictions (that do not exist in Windows) on OpenGL - contexts, if you want to prevent the screen to flicker when - using OpenGL applications (all games are using double-buffered - contexts), you need to set the following option in your - <filename>~/.wine/config</filename> file - in the <literal>[x11drv]</literal> section: - <programlisting> -DesktopDoubleBuffered = Y - </programlisting> - and to run Wine in desktop mode. - </para> - </sect2> - - <sect2> <title>Unknown extension error message:</title> <screen> @@ -284,7 +264,7 @@ Please report (lionel.ulmer(a)free.fr) ! </sect2> <sect2> - <title><filename>libopengl32.so</filename> is built but it is still not working</title> + <title><filename>opengl32.dll.so</filename> is built but it is still not working</title> <para> This may be caused by some missing functions required by @@ -310,12 +290,12 @@ int main(void) <listitem> <para> try to compile it by linking both libwine and - libopengl32 (this command line supposes that you + opengl32 (this command line supposes that you installed the Wine libraries in <filename>/usr/local/lib</filename>, YMMV) : </para> <programlisting> -gcc dummy.c -L/usr/local/lib -lwine -lopengl32 +gcc dummy.c -L/usr/local/lib -L/usr/local/lib/wine -lwine -lopengl32 </programlisting> </listitem> <listitem>

1 0