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

Jens Reyer : winemaker: Fix macro-not-defined errors from man.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 6ea8b64d23eb1da71a51e9d42450cfb945f894f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea8b64d23eb1da71a51e9d42… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Tue Mar 1 19:49:42 2016 +0100 winemaker: Fix macro-not-defined errors from man. ' characters at the start of a line indicate a groff command. If used in error, the affected lines get ignored. Therefore add a zero-width space and reformat another paragraph to keep the literal meaning. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 93fc6826c210ebb3e8ee11207d39515b954858cb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winemaker/winemaker.de.UTF-8.man.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winemaker/winemaker.de.UTF-8.man.in b/tools/winemaker/winemaker.de.UTF-8.man.in index 2446a4f..e4df360 100644 --- a/tools/winemaker/winemaker.de.UTF-8.man.in +++ b/tools/winemaker/winemaker.de.UTF-8.man.in @@ -58,7 +58,7 @@ im Includepfad suchen und die entsprechende Zeile, falls nötig, mit der korrekt Groß-/Kleinschreibweise austauschen. .PP - Winemaker wird ebenso andere, exotischere Probleme wie die Benutzung von -'#pragma pack', 'afxres.h' in nicht-MFC-Projekten und mehr untersuchen. +\&'#pragma pack', 'afxres.h' in nicht-MFC-Projekten und mehr untersuchen. Sollte etwas ungwöhnliches vorkommen, wird Winemaker Sie warnen. .PP - Winemaker kann eine ganze Verzeichnisstruktur auf einmal durchsuchen, @@ -198,9 +198,9 @@ $ winemaker --lower-uppercase -DSTRICT . Damit scannt Winemaker das aktuelle Verzeichnis und die Unterverzeichnisse nach Quellcodedateien. Jede Datei und jedes Verzeichnis, das ganz in Großbuchstaben geschrieben ist, wird in Kleinbuchstaben umbenannt. Danach werden alle Quellcodedateien -an die Kompilierung mit Winelib angepasst und Makefiles erzeugt. -'-DSTRICT' gibt an, dass das STRICT-Makro gesetzt sein muss, um diesen Quellcode -zu kompilieren. Letztendlich wird Winemaker die globale Makefile erzeugen. +an die Kompilierung mit Winelib angepasst und Makefiles erzeugt. '-DSTRICT' gibt +an, dass das STRICT-Makro gesetzt sein muss, um diesen Quellcode zu kompilieren. +Letztendlich wird Winemaker die globale Makefile erzeugen. .PP Der nächste Schritt wäre dann: .PP

1 0

Miklós Máté : winex11: Add 1280x960 resolution.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 574d17a0640e6ee9d70d1c272cd96ddddd435c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=574d17a0640e6ee9d70d1c272… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Tue Feb 23 18:37:30 2016 +0100 winex11: Add 1280x960 resolution. This enables high resolution setting in Anachronox, when Wine is configured to emulate a virtual desktop. The game only supports 640x480 and 1280x960. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c0219a73848245d5f3b85c79330b2bb1792df230) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/desktop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 603e19f..2d8c039 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -37,8 +37,8 @@ static unsigned int dd_mode_count; static unsigned int max_width; static unsigned int max_height; -static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1400, 1600}; -static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 1024, 1050, 1200}; +static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; +static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; #define NUM_DESKTOP_MODES (sizeof(widths) / sizeof(widths[0])) #define _NET_WM_STATE_REMOVE 0

1 0

Jacek Caban : user32: Added more tests of handling parent/owner by dialog.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: ae39337e77f845dfe70d0279cad199bb2fb798ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae39337e77f845dfe70d0279c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 14:41:34 2016 +0200 user32: Added more tests of handling parent/owner by dialog. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae39337e77f845dfe70d0…

1 0

Jacek Caban : user32: Use the original owner used to create the dialog for WM_ENTERIDLE messages.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: 36b64321b2d6f2e80c78129dac2a4ffe4881d2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b64321b2d6f2e80c78129da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 14:41:27 2016 +0200 user32: Use the original owner used to create the dialog for WM_ENTERIDLE messages. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/dialog.c | 4 ++-- dlls/user.exe16/user_private.h | 2 +- dlls/user32/controls.h | 4 ++-- dlls/user32/dialog.c | 22 +++++++++++----------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 766a468..e5bf7b9 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -744,7 +744,7 @@ INT16 WINAPI DialogBoxParam16( HINSTANCE16 hInst, LPCSTR template, { HWND owner = WIN_Handle32(owner16); hwnd = DIALOG_CreateIndirect16( hInst, data, owner, dlgProc, param, TRUE ); - if (hwnd) ret = wow_handlers32.dialog_box_loop( hwnd ); + if (hwnd) ret = wow_handlers32.dialog_box_loop( hwnd, owner ); GlobalUnlock16( hmem ); } FreeResource16( hmem ); @@ -764,7 +764,7 @@ INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate, if (!(ptr = GlobalLock16( dlgTemplate ))) return -1; hwnd = DIALOG_CreateIndirect16( hInst, ptr, owner, dlgProc, param, TRUE ); GlobalUnlock16( dlgTemplate ); - if (hwnd) return wow_handlers32.dialog_box_loop( hwnd ); + if (hwnd) return wow_handlers32.dialog_box_loop( hwnd, owner ); return -1; } diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 3d97546..7c91afb 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -63,7 +63,7 @@ struct wow_handlers32 HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); - INT (*dialog_box_loop)(HWND); + INT (*dialog_box_loop)(HWND,HWND); ULONG_PTR (*get_icon_param)(HICON); ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 4fdab62..1641645 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -121,7 +121,7 @@ struct wow_handlers32 HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); - INT (*dialog_box_loop)(HWND); + INT (*dialog_box_loop)(HWND,HWND); ULONG_PTR (*get_icon_param)(HICON); ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; @@ -243,7 +243,7 @@ typedef struct tagDIALOGINFO #define DF_END 0x0001 extern DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) DECLSPEC_HIDDEN; -extern INT DIALOG_DoDialogBox( HWND hwnd ) DECLSPEC_HIDDEN; +extern INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) DECLSPEC_HIDDEN; HRGN set_control_clipping( HDC hdc, const RECT *rect ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index b5ed902..9cb4b8d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -445,7 +445,7 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result ) */ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, HWND owner, DLGPROC dlgProc, LPARAM param, - BOOL unicode, BOOL modal ) + BOOL unicode, HWND *modal_owner ) { HWND hwnd; RECT rect; @@ -584,7 +584,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } } - if (modal && owner) + if (modal_owner && owner) { HWND parent; /* @@ -599,6 +599,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (!parent || parent == GetDesktopWindow()) break; owner = parent; } + *modal_owner = owner; if (IsWindowEnabled( owner )) { disabled_owner = owner; @@ -768,9 +769,8 @@ HWND WINAPI CreateDialogIndirectParamW( HINSTANCE hInst, LPCDLGTEMPLATEW dlgTemp /*********************************************************************** * DIALOG_DoDialogBox */ -INT DIALOG_DoDialogBox( HWND hwnd ) +INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) { - HWND owner = GetWindow( hwnd, GW_OWNER ); DIALOGINFO * dlgInfo; MSG msg; INT retval; @@ -792,7 +792,7 @@ INT DIALOG_DoDialogBox( HWND hwnd ) bFirstEmpty = FALSE; } if (!(GetWindowLongW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) - { + { /* No message present -> send ENTERIDLE and wait */ SendMessageW( owner, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); } @@ -839,8 +839,8 @@ INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name, if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; - hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd ); + hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, &owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); return 0; } @@ -857,8 +857,8 @@ INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name, if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; - hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd ); + hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, &owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); return 0; } @@ -870,8 +870,8 @@ INT_PTR WINAPI DialogBoxIndirectParamAorW( HINSTANCE hInstance, LPCVOID template HWND owner, DLGPROC dlgProc, LPARAM param, DWORD flags ) { - HWND hwnd = DIALOG_CreateIndirect( hInstance, template, owner, dlgProc, param, !flags, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd ); + HWND hwnd = DIALOG_CreateIndirect( hInstance, template, owner, dlgProc, param, !flags, &owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); return -1; }

1 0

Francois Gouget : wined3d: Fix a typo in an error message.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: 1c201a96c57a68caaf6c976d7f3732738c9d9ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c201a96c57a68caaf6c976d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 11 12:20:46 2016 +0200 wined3d: Fix a typo in an error message. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index afb47e1..06163ab 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -81,7 +81,7 @@ static const char *arb_get_helper_value(enum wined3d_shader_type shader, enum ar { if (shader != WINED3D_SHADER_TYPE_VERTEX && shader != WINED3D_SHADER_TYPE_PIXEL) { - ERR("Unsupported shader type '%s'.\n.", debug_shader_type(shader)); + ERR("Unsupported shader type '%s'.\n", debug_shader_type(shader)); return "bad"; }

1 0

Jacek Caban : user32: Don't enable owner in DIALOG_DoDialogBox.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: fc4b906d784db3681d1626d29becb886cf1a6d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4b906d784db3681d1626d29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 14:41:10 2016 +0200 user32: Don't enable owner in DIALOG_DoDialogBox. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 1 - dlls/user32/dialog.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 542bf39..4fdab62 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -241,7 +241,6 @@ typedef struct tagDIALOGINFO } DIALOGINFO; #define DF_END 0x0001 -#define DF_OWNERENABLED 0x0002 extern DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) DECLSPEC_HIDDEN; extern INT DIALOG_DoDialogBox( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 2804ed2..b5ed902 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -601,7 +601,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } if (IsWindowEnabled( owner )) { - flags |= DF_OWNERENABLED; disabled_owner = owner; EnableWindow( disabled_owner, FALSE ); } @@ -822,7 +821,6 @@ INT DIALOG_DoDialogBox( HWND hwnd ) } } } - if (dlgInfo->flags & DF_OWNERENABLED) EnableWindow( owner, TRUE ); retval = dlgInfo->idResult; DestroyWindow( hwnd ); return retval;

1 0

Henri Verbeet : wined3d: Store sub-resource map counts in the sub-resource structure.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: 2a2554ee59745b6d5713d9f14ef0556c70e36b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2554ee59745b6d5713d9f14… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 10 18:09:27 2016 +0200 wined3d: Store sub-resource map counts in the sub-resource structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 34 +++++++++++++++++++++------------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 31 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a2554ee59745b6d5713d…

1 0

Jacek Caban : user32: Use GWLP_HWNDPARENT to find an owner in EndDialog.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: 2f8f9d20aa50b5ae0c65f42196d3c7f513a61fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f8f9d20aa50b5ae0c65f4219… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 14:41:03 2016 +0200 user32: Use GWLP_HWNDPARENT to find an owner in EndDialog. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 2bacf4d..2804ed2 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -914,7 +914,7 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) dlgInfo->idResult = retval; dlgInfo->flags |= DF_END; - owner = GetWindow( hwnd, GW_OWNER ); + owner = (HWND)GetWindowLongPtrA( hwnd, GWLP_HWNDPARENT ); if (owner) EnableWindow( owner, TRUE );

1 0

Henri Verbeet : d3d9/tests: Add some more surface GetDC() tests to test_getdc().
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: b8ffc4df1c0652201f4787bef2fa8f6df46ac811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ffc4df1c0652201f4787bef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 10 18:09:30 2016 +0200 d3d9/tests: Add some more surface GetDC() tests to test_getdc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 151 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8ffc4df1c0652201f478…

1 0

Henri Verbeet : ddraw/tests: Rewrite GetDCFormatTest().
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: 77e6d98819079fa85bbe46a37478f864acc97aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e6d98819079fa85bbe46a37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 10 18:09:28 2016 +0200 ddraw/tests: Rewrite GetDCFormatTest(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 116 +++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 116 +++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 117 +++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 117 +++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 240 -------------------------------------------- 5 files changed, 466 insertions(+), 240 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77e6d98819079fa85bbe4…

1 0