July 2013 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Add registry setting to control setting display gamma ramp.
by Alexandre Julliard 09 Jul '13

09 Jul '13

Module: wine Branch: master Commit: 4f23821f080ead6232377141fb10338d4f2a04cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f23821f080ead6232377141f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 8 17:36:49 2013 -0500 winemac: Add registry setting to control setting display gamma ramp. --- dlls/winemac.drv/display.c | 6 ++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 9ed02f8..e44415d 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -797,6 +797,12 @@ BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) TRACE("dev %p ramp %p\n", dev, ramp); + if (!allow_set_gamma) + { + TRACE("disallowed by registry setting\n"); + return FALSE; + } + if (macdrv_get_displays(&displays, &num_displays)) { WARN("failed to get Mac displays\n"); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 3c7bea5..4c74ddc 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -37,6 +37,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; extern BOOL allow_vsync DECLSPEC_HIDDEN; +extern BOOL allow_set_gamma DECLSPEC_HIDDEN; extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 6bae707..dd032f3 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -49,6 +49,7 @@ int topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN; int capture_displays_for_fullscreen = 0; BOOL skip_single_buffer_flushes = FALSE; BOOL allow_vsync = TRUE; +BOOL allow_set_gamma = TRUE; /************************************************************************** @@ -164,6 +165,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "AllowVerticalSync", buffer, sizeof(buffer))) allow_vsync = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "AllowSetGamma", buffer, sizeof(buffer))) + allow_set_gamma = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); }

1 0

Ken Thomases : Revert "winemac: Dispatch key events directly to window to be sure to get key-up events.".
by Alexandre Julliard 09 Jul '13

09 Jul '13

Module: wine Branch: master Commit: a723af61acbec0915867a9de4713eceba9379dcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a723af61acbec0915867a9de4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jul 9 02:49:55 2013 -0500 Revert "winemac: Dispatch key events directly to window to be sure to get key-up events.". This reverts commit 0d20ac02f778540844ae37ecc79220f72431a6f4. --- dlls/winemac.drv/cocoa_app.m | 6 ------ dlls/winemac.drv/cocoa_window.h | 2 -- dlls/winemac.drv/cocoa_window.m | 15 ++++++++++++++- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 461472b..25081db 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1692,12 +1692,6 @@ int macdrv_err_on; [self handleScrollWheel:anEvent]; ret = mouseCaptureWindow != nil; } - else if (type == NSKeyDown || type == NSKeyUp) - { - WineWindow* window = (WineWindow*)[anEvent window]; - if ([window isKindOfClass:[WineWindow class]]) - [window postKeyEvent:anEvent]; - } return ret; } diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index e0e581b..c5a630f 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -68,6 +68,4 @@ - (NSInteger) minimumLevelForActive:(BOOL)active; - (void) updateFullscreen; - - (void) postKeyEvent:(NSEvent *)theEvent; - @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 0e2d7e6..e88a854 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1195,6 +1195,18 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } } + - (void) sendEvent:(NSEvent*)event + { + /* NSWindow consumes certain key-down events as part of Cocoa's keyboard + interface control. For example, Control-Tab switches focus among + views. We want to bypass that feature, so directly route key-down + events to -keyDown:. */ + if ([event type] == NSKeyDown) + [[self firstResponder] keyDown:event]; + else + [super sendEvent:event]; + } + // We normally use the generic/calibrated RGB color space for the window, // rather than the device color space, to avoid expensive color conversion // which slows down drawing. However, for windows displaying OpenGL, having @@ -1230,7 +1242,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) /* * ---------- NSResponder method overrides ---------- */ - - (void) keyDown:(NSEvent *)theEvent { /* Need an implementation to avoid beeps */ } + - (void) keyDown:(NSEvent *)theEvent { [self postKeyEvent:theEvent]; } + - (void) keyUp:(NSEvent *)theEvent { [self postKeyEvent:theEvent]; } - (void) flagsChanged:(NSEvent *)theEvent {

1 0

Ken Thomases : winemac: Dispatch key-up events directly to window to be sure to get them.
by Alexandre Julliard 09 Jul '13

09 Jul '13

Module: wine Branch: master Commit: a39b02c3e77cf2082c548c65958fd56d0897c1fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39b02c3e77cf2082c548c659… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jul 9 02:49:59 2013 -0500 winemac: Dispatch key-up events directly to window to be sure to get them. For keys pressed in combination with Command, -[NSApplication sendEvent:] simply doesn't pass the key-up event through to the window. We have to track which keys we've told Wine are pressed because Cocoa may consume key-downs that trigger menus or system behaviors. --- dlls/winemac.drv/cocoa_app.h | 2 ++ dlls/winemac.drv/cocoa_app.m | 30 ++++++++++++++++++++++++++++++ dlls/winemac.drv/cocoa_window.h | 2 ++ dlls/winemac.drv/cocoa_window.m | 3 ++- 4 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 0614c76..25f60f6 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -54,6 +54,7 @@ enum { NSEvent* lastFlagsChanged; BOOL inputSourceIsInputMethod; BOOL inputSourceIsInputMethodValid; + uint32_t pressedKeyCodes[128 / 32]; CGFloat primaryScreenHeight; BOOL primaryScreenHeightValid; @@ -105,6 +106,7 @@ enum { - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout processEvents:(BOOL)processEvents; - (void) keyboardSelectionDidChange; + - (void) noteKey:(uint16_t)keyCode pressed:(BOOL)pressed; - (void) flipRect:(NSRect*)rect; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 25081db..8de68bb 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1280,6 +1280,25 @@ int macdrv_err_on; return TRUE; } + - (BOOL) isKeyPressed:(uint16_t)keyCode + { + int bits = sizeof(pressedKeyCodes[0]) * 8; + int index = keyCode / bits; + uint32_t mask = 1 << (keyCode % bits); + return (pressedKeyCodes[index] & mask) != 0; + } + + - (void) noteKey:(uint16_t)keyCode pressed:(BOOL)pressed + { + int bits = sizeof(pressedKeyCodes[0]) * 8; + int index = keyCode / bits; + uint32_t mask = 1 << (keyCode % bits); + if (pressed) + pressedKeyCodes[index] |= mask; + else + pressedKeyCodes[index] &= ~mask; + } + - (void) handleMouseMove:(NSEvent*)anEvent { WineWindow* targetWindow; @@ -1692,6 +1711,17 @@ int macdrv_err_on; [self handleScrollWheel:anEvent]; ret = mouseCaptureWindow != nil; } + else if (type == NSKeyUp) + { + uint16_t keyCode = [anEvent keyCode]; + if ([self isKeyPressed:keyCode]) + { + WineWindow* window = (WineWindow*)[anEvent window]; + [self noteKey:keyCode pressed:FALSE]; + if ([window isKindOfClass:[WineWindow class]]) + [window postKeyEvent:anEvent]; + } + } return ret; } diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index c5a630f..e0e581b 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -68,4 +68,6 @@ - (NSInteger) minimumLevelForActive:(BOOL)active; - (void) updateFullscreen; + - (void) postKeyEvent:(NSEvent *)theEvent; + @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e88a854..4a0a945 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1117,6 +1117,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [queue postEvent:event]; macdrv_release_event(event); + + [controller noteKey:keyCode pressed:pressed]; } - (void) postKeyEvent:(NSEvent *)theEvent @@ -1243,7 +1245,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) * ---------- NSResponder method overrides ---------- */ - (void) keyDown:(NSEvent *)theEvent { [self postKeyEvent:theEvent]; } - - (void) keyUp:(NSEvent *)theEvent { [self postKeyEvent:theEvent]; } - (void) flagsChanged:(NSEvent *)theEvent {

1 0

Alexandre Julliard : taskmgr: Convert version resource to the standard format.
by Alexandre Julliard 09 Jul '13

09 Jul '13

Module: wine Branch: master Commit: f241725bd8495fcaa902b8006be6eef6aac1ee1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f241725bd8495fcaa902b8006… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 14:33:05 2013 +0200 taskmgr: Convert version resource to the standard format. --- programs/taskmgr/taskmgr.rc | 41 +++++++++-------------------------------- 1 files changed, 9 insertions(+), 32 deletions(-) diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index 741c61f..c8b5999 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -590,38 +590,15 @@ IDI_WINDOWSM ICON windowsm.ico Version */ -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "Brian Palmer\0" - VALUE "FileDescription", "Task Manager by Brian Palmer\0" - VALUE "FileVersion", "1.0.0.1\0" - VALUE "InternalName", "taskmgr\0" - VALUE "LegalCopyright", "Copyright © Brian Palmer 2000\0" - VALUE "OriginalFilename", "taskmgr.exe\0" - VALUE "ProductName", "Task Manager by Brian Palmer\0" - VALUE "ProductVersion", "1.0.0.1\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END +#define WINE_FILEVERSION 1,0,0,1 +#define WINE_FILEVERSION_STR "1.0.0.1" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEDESCRIPTION_STR "Wine Task Manager" +#define WINE_FILENAME "taskmgr" +#define WINE_FILENAME_STR "taskmgr.exe" +#define WINE_PRODUCTNAME_STR "Task Manager by Brian Palmer" + +#include "wine/wine_common_ver.rc" /* Bitmap

1 0

Alexandre Julliard : browseui: Use neutral language for the version resource.
by Alexandre Julliard 09 Jul '13

09 Jul '13

Module: wine Branch: master Commit: 71e765aab5035c1d1f4e24e844e8e91ae3b4f5f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e765aab5035c1d1f4e24e84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 15:47:00 2013 +0200 browseui: Use neutral language for the version resource. --- dlls/browseui/browseui.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc index 3257466..10f3db2 100644 --- a/dlls/browseui/browseui.rc +++ b/dlls/browseui/browseui.rc @@ -38,6 +38,8 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine core dll" #define WINE_FILENAME_STR "browseui.dll" #define WINE_FILEVERSION 6,0,2900,2180

1 0

Alexandre Julliard : crypt32: Use neutral language for the version resource .
by Alexandre Julliard 09 Jul '13

09 Jul '13

Module: wine Branch: master Commit: 95f8f0b6864c750be00ab279a054e9d7a5398f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f8f0b6864c750be00ab279a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 15:47:06 2013 +0200 crypt32: Use neutral language for the version resource. --- dlls/crypt32/crypt32.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.rc b/dlls/crypt32/crypt32.rc index df74e2b..6381054 100644 --- a/dlls/crypt32/crypt32.rc +++ b/dlls/crypt32/crypt32.rc @@ -237,6 +237,8 @@ STRINGTABLE IDS_NETSCAPE_SIGN_CA "Signature CA" } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine CryptoAPI Library" #define WINE_FILENAME_STR "crypt32.dll" #define WINE_FILEVERSION 5,131,2600,1243

1 0

Alexandre Julliard : devenum: Use neutral language for the version resource .
by Alexandre Julliard 09 Jul '13

09 Jul '13

Module: wine Branch: master Commit: b9d56b354308d5c1134288c270930e53736a2884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9d56b354308d5c1134288c27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 15:47:10 2013 +0200 devenum: Use neutral language for the version resource. --- dlls/devenum/devenum.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index b72cc9b..8e79272 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -35,6 +35,8 @@ STRINGTABLE IDS_DEVENUM_MIDEFAULT "Default MidiOut Device" } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Device Enumerator Library" #define WINE_FILENAME_STR "devenum.dll" #define WINE_FILEVERSION 6,5,1,902

1 0

Alexandre Julliard : dxdiagn: Use neutral language for the version resource .
by Alexandre Julliard 09 Jul '13

09 Jul '13

Module: wine Branch: master Commit: 733312f2f043460bfa29059c93d0d147b886e432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=733312f2f043460bfa29059c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 15:47:16 2013 +0200 dxdiagn: Use neutral language for the version resource. --- dlls/dxdiagn/dxdiagn.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/dxdiagn.rc b/dlls/dxdiagn/dxdiagn.rc index b37d314..bc89346 100644 --- a/dlls/dxdiagn/dxdiagn.rc +++ b/dlls/dxdiagn/dxdiagn.rc @@ -26,6 +26,8 @@ STRINGTABLE IDS_PAGE_FILE_FORMAT "%1!u!MB used, %2!u!MB available" } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine DxDiag 8" #define WINE_FILENAME_STR "dxdiagn.dll" #define WINE_FILEVERSION 5,3,1,904

1 0

Alexandre Julliard : joy.cpl: Use neutral language for the version resource .
by Alexandre Julliard 09 Jul '13

09 Jul '13

Module: wine Branch: master Commit: 4dc12c4e391aeb1b1c067ac610b95bb935fb185b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc12c4e391aeb1b1c067ac61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 15:47:21 2013 +0200 joy.cpl: Use neutral language for the version resource. --- dlls/joy.cpl/joy.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index 3214a21..ffcea55 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -68,6 +68,8 @@ FONT 8, "Ms Shell Dlg" GROUPBOX "Direction", IDC_STATIC, 220, 30, 60, 60 } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + /* @makedep: joy.ico */ ICO_MAIN ICON "joy.ico"

1 0

Alexandre Julliard : localspl: Use neutral language for the version resource.
by Alexandre Julliard 09 Jul '13

09 Jul '13

Module: wine Branch: master Commit: 0b3a58090a634c532a0edccb404cce39aec2e3d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b3a58090a634c532a0edccb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 15:47:26 2013 +0200 localspl: Use neutral language for the version resource. --- dlls/localspl/localspl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index fc8fe22..2b8f698 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -29,6 +29,8 @@ STRINGTABLE IDS_LOCALMONITOR "Local Monitor" } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILENAME_STR "localspl.dll" #define WINE_FILEDESCRIPTION_STR "Wine Printer spooler component"

1 0