June 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Make the standard C functions available for importing.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: bdd48b41d313dd6776620a9116d9249b4d7ee3ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdd48b41d313dd6776620a91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 11:47:16 2019 +0200 ntdll: Make the standard C functions available for importing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 236 +++++++++++++++++++++++++------------------------- 1 file changed, 118 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bdd48b41d313dd677662…

1 0

Alexandre Julliard : kernelbase: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 483de1a8a263f83fa991fd6daa47feda8681d3b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=483de1a8a263f83fa991fd6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 22:38:09 2019 +0200 kernelbase: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/main.c | 10 ++ dlls/kernelbase/path.c | 350 ++++++++++++++++++++------------------------ dlls/kernelbase/string.c | 93 ++++++------ tools/winegcc/winegcc.c | 2 + 5 files changed, 222 insertions(+), 236 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=483de1a8a263f83fa991…

1 0

Zebediah Figura : winex11: Remove redundant calls to update_key_state().
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 178d2c57689d3cc27c9f0fbc517e59b8a87ec399 URL: https://source.winehq.org/git/wine.git/?a=commit;h=178d2c57689d3cc27c9f0fbc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 17 14:46:19 2019 -0500 winex11: Remove redundant calls to update_key_state(). These will not actually do anything, and were probably added by mistake, after the similar calls to VK_CONTROL et al. above. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 3b8d916..b063491 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1288,8 +1288,6 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) update_key_state( keystate, VK_CONTROL, (keystate[VK_LCONTROL] | keystate[VK_RCONTROL]) & 0x80 ); update_key_state( keystate, VK_MENU, (keystate[VK_LMENU] | keystate[VK_RMENU]) & 0x80 ); update_key_state( keystate, VK_SHIFT, (keystate[VK_LSHIFT] | keystate[VK_RSHIFT]) & 0x80 ); - update_key_state( keystate, VK_LWIN, keystate[VK_LWIN] & 0x80 ); - update_key_state( keystate, VK_RWIN, keystate[VK_RWIN] & 0x80 ); set_async_key_state( keystate ); return TRUE; }

1 0

Zebediah Figura : winex11: Update the state of all keys on KeymapNotify.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 1bc9c4fdb2e6c2762105c14cdafb7d4ea3370625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bc9c4fdb2e6c2762105c14c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 17 14:46:20 2019 -0500 winex11: Update the state of all keys on KeymapNotify. The Binding of Isaac transitions in and out of fullscreen when the "F" key is pressed. Specifically, it will swap states when receiving WM_KEYDOWN, provided that the previous key state was not pressed (i.e. bit 30 is 0). However, as part of the process of transitioning, it hides and shows its window, causing it to temporarily lose focus. If the F key is released while the window does not have focus, Wine misses this fact, and thinks that the key was already pressed the next time it is pressed, causing the game to refuse to change focus. Windows will not deliver WM_KEYUP messages to a window that does not have focus, but it will always report the true previous state of any key on the keyboard when requested. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 55 +++++++++------------------------------------ 1 file changed, 11 insertions(+), 44 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index b063491..131c5f5 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1212,13 +1212,12 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) BOOL changed = FALSE; struct { WORD vkey; - BOOL pressed; - } modifiers[6]; /* VK_LSHIFT through VK_RMENU are contiguous */ - BOOL lwin_pressed = FALSE, rwin_pressed = FALSE; + WORD pressed; + } keys[256]; if (!get_async_key_state( keystate )) return FALSE; - memset(modifiers, 0, sizeof(modifiers)); + memset(keys, 0, sizeof(keys)); EnterCriticalSection( &kbd_section ); @@ -1229,59 +1228,27 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) { for (j = 0; j < 8; j++) { - int m; - vkey = keyc2vkey[(i * 8) + j]; - switch(vkey & 0xff) - { - case VK_LMENU: - case VK_RMENU: - case VK_LCONTROL: - case VK_RCONTROL: - case VK_LSHIFT: - case VK_RSHIFT: - m = (vkey & 0xff) - VK_LSHIFT; - /* Take the vkey from the first keycode we encounter for this modifier */ - if (!modifiers[m].vkey) modifiers[m].vkey = vkey; - if (event->xkeymap.key_vector[i] & (1<<j)) modifiers[m].pressed = TRUE; - break; - case VK_LWIN: - if (event->xkeymap.key_vector[i] & (1<<j)) lwin_pressed = TRUE; - break; - case VK_RWIN: - if (event->xkeymap.key_vector[i] & (1<<j)) rwin_pressed = TRUE; - break; - } + /* If multiple keys map to the same vkey, we want to report it as + * pressed iff any of them are pressed. */ + if (!keys[vkey & 0xff].vkey) keys[vkey & 0xff].vkey = vkey; + if (event->xkeymap.key_vector[i] & (1<<j)) keys[vkey & 0xff].pressed = TRUE; } } - for (vkey = VK_LSHIFT; vkey <= VK_RMENU; vkey++) + for (vkey = 1; vkey <= 0xff; vkey++) { - int m = vkey - VK_LSHIFT; - if (modifiers[m].vkey && !(keystate[vkey] & 0x80) != !modifiers[m].pressed) + if (keys[vkey].vkey && !(keystate[vkey] & 0x80) != !keys[vkey].pressed) { TRACE( "Adjusting state for vkey %#.2x. State before %#.2x\n", - modifiers[m].vkey, keystate[vkey]); + keys[vkey].vkey, keystate[vkey]); - update_key_state( keystate, vkey, modifiers[m].pressed ); + update_key_state( keystate, vkey, keys[vkey].pressed ); changed = TRUE; } } - if (!(keystate[VK_LWIN] & 0x80) != !lwin_pressed) - { - TRACE( "Adjusting state for VK_LWIN. State before %#.2x\n", keystate[VK_LWIN]); - update_key_state( keystate, VK_LWIN, lwin_pressed ); - changed = TRUE; - } - if (!(keystate[VK_RWIN] & 0x80) != !rwin_pressed) - { - TRACE( "Adjusting state for VK_RWIN. State before %#.2x\n", keystate[VK_RWIN]); - update_key_state( keystate, VK_RWIN, rwin_pressed ); - changed = TRUE; - } - LeaveCriticalSection( &kbd_section ); if (!changed) return FALSE;

1 0

Alexandre Julliard : oledlg: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 815ae120fb2648b5c7b9aca864a58377d8947cfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=815ae120fb2648b5c7b9aca8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:11 2019 +0200 oledlg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledlg/Makefile.in | 2 ++ dlls/oledlg/insobjdlg.c | 1 - dlls/oledlg/oledlg_main.c | 1 - dlls/oledlg/pastespl.c | 9 ++++----- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index 4a16469..ee54844 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -2,6 +2,8 @@ MODULE = oledlg.dll IMPORTLIB = oledlg IMPORTS = ole32 comdlg32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ insobjdlg.c \ oledlg_main.c \ diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 00b991e..18919b2 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -29,7 +29,6 @@ #include "wingdi.h" #include "winuser.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "oledlg.h" #include "resource.h" diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index ba5b7c8..df53ad7 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -33,7 +33,6 @@ #include "resource.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 0b8c8c9..2593fd5 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -35,7 +35,6 @@ #include "resource.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -432,15 +431,15 @@ static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct) } LoadStringW(OLEDLG_hInstance, res_id, resource_txt, ARRAY_SIZE(resource_txt)); - if((ptr = strstrW(resource_txt, percent_s))) + if((ptr = wcsstr(resource_txt, percent_s))) { /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropriate type name */ - size_t result_txt_len = strlenW(pent->lpstrResultText); + size_t result_txt_len = lstrlenW(pent->lpstrResultText); ptrdiff_t offs = (char*)ptr - (char*)resource_txt; - result_txt = HeapAlloc(GetProcessHeap(), 0, (strlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR)); + result_txt = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR)); memcpy(result_txt, resource_txt, offs); memcpy((char*)result_txt + offs, pent->lpstrResultText, result_txt_len * sizeof(WCHAR)); - memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (strlenW(ptr + 2) + 1) * sizeof(WCHAR)); + memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (lstrlenW(ptr + 2) + 1) * sizeof(WCHAR)); } else result_txt = resource_txt;

1 0

Alexandre Julliard : olepro32: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 7e2df6ed13cc716554851c1a297766a8fbe92724 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e2df6ed13cc716554851c1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:17 2019 +0200 olepro32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olepro32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/olepro32/Makefile.in b/dlls/olepro32/Makefile.in index 032fdbd..4ff5afc 100644 --- a/dlls/olepro32/Makefile.in +++ b/dlls/olepro32/Makefile.in @@ -2,6 +2,8 @@ MODULE = olepro32.dll IMPORTLIB = olepro32 IMPORTS = oleaut32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = olepro32stubs.c IDL_SRCS = olepro.idl

1 0

Alexandre Julliard : olesvr: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 15a7f2af678113015df0c1b7cc50115215473cb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15a7f2af678113015df0c1b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:32 2019 +0200 olesvr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olesvr.dll16/Makefile.in | 2 +- dlls/olesvr.dll16/olesvr.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/olesvr.dll16/Makefile.in b/dlls/olesvr.dll16/Makefile.in index d894b58..02ed8ae 100644 --- a/dlls/olesvr.dll16/Makefile.in +++ b/dlls/olesvr.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = olesvr.dll16 IMPORTS = gdi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,olesvr32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,olesvr32.dll C_SRCS = olesvr.c diff --git a/dlls/olesvr.dll16/olesvr.c b/dlls/olesvr.dll16/olesvr.c index 0dcc705..44e6822 100644 --- a/dlls/olesvr.dll16/olesvr.c +++ b/dlls/olesvr.dll16/olesvr.c @@ -21,8 +21,6 @@ /* At the moment, these are only empty stubs. */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : olesvr32: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: fa5042dc852ef96abe7caa638f2eae19f704fc29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa5042dc852ef96abe7caa63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:49 2019 +0200 olesvr32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olesvr32/Makefile.in | 2 ++ dlls/olesvr32/olesvr_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/olesvr32/Makefile.in b/dlls/olesvr32/Makefile.in index 0cea1ad..67c612d 100644 --- a/dlls/olesvr32/Makefile.in +++ b/dlls/olesvr32/Makefile.in @@ -1,5 +1,7 @@ MODULE = olesvr32.dll IMPORTLIB = olesvr32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ olesvr_main.c diff --git a/dlls/olesvr32/olesvr_main.c b/dlls/olesvr32/olesvr_main.c index 57c28e1..0ca83ba 100644 --- a/dlls/olesvr32/olesvr_main.c +++ b/dlls/olesvr32/olesvr_main.c @@ -21,8 +21,6 @@ /* At the moment, these are only empty stubs. */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : olethk32: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: ee5127647f183f2529debdba71725628194b9306 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee5127647f183f2529debdba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:00:55 2019 +0200 olethk32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olethk32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/olethk32/Makefile.in b/dlls/olethk32/Makefile.in index 1a8f17a..6888b46 100644 --- a/dlls/olethk32/Makefile.in +++ b/dlls/olethk32/Makefile.in @@ -1,5 +1,7 @@ MODULE = olethk32.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = main.c RC_SRCS = version.rc

1 0

Alexandre Julliard : packager: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 59f23b3139ce01ba142195451b026883f5d068a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59f23b3139ce01ba14219545… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:05:21 2019 +0200 packager: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/packager/Makefile.in | 2 ++ dlls/packager/packager_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/packager/Makefile.in b/dlls/packager/Makefile.in index a2b2daa..a90014c 100644 --- a/dlls/packager/Makefile.in +++ b/dlls/packager/Makefile.in @@ -1,6 +1,8 @@ MODULE = packager.dll IMPORTS = uuid shell32 shlwapi user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ packager_main.c diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index d70202b..0a0790e 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define COBJMACROS

1 0