December 2014 - Wine-Commits

André Hentschel : winex11.drv: Remove unused code ( Clang).
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: 3bddfebe992079e551acad2ac969cbe1bf8bedfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bddfebe992079e551acad2ac… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:53:52 2014 +0100 winex11.drv: Remove unused code (Clang). --- dlls/winex11.drv/opengl.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index cf5d440..7b8ba82 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -272,13 +272,6 @@ static XContext gl_hwnd_context; /* X context to associate a struct gl_drawable to a pbuffer hdc */ static XContext gl_pbuffer_context; -static const struct gdi_dc_funcs glxdrv_funcs; - -static inline struct glx_physdev *get_glxdrv_dev( PHYSDEV dev ) -{ - return (struct glx_physdev *)dev; -} - static struct list context_list = LIST_INIT( context_list ); static struct WineGLInfo WineGLInfo = { 0 }; static struct wgl_pixel_format *pixel_formats;

1 0

Piotr Caban : msvcrt: Call CreateProcess with CREATE_UNICODE_ENVIRONMENT flag in exec functions family.
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: a4fcba60b9a8084e8a579e503a83c5241f437135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fcba60b9a8084e8a579e503… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 4 11:41:30 2014 +0100 msvcrt: Call CreateProcess with CREATE_UNICODE_ENVIRONMENT flag in exec functions family. Based on a patch by Ron Yorston. --- dlls/msvcrt/process.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index b782727..f3c9000 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -134,6 +134,7 @@ static MSVCRT_intptr_t msvcrt_spawn(int flags, const MSVCRT_wchar_t* exe, MSVCRT STARTUPINFOW si; PROCESS_INFORMATION pi; MSVCRT_wchar_t fullname[MAX_PATH]; + DWORD create_flags = CREATE_UNICODE_ENVIRONMENT; TRACE("%x %s %s %s %d\n", flags, debugstr_w(exe), debugstr_w(cmdline), debugstr_w(env), use_path); @@ -148,9 +149,9 @@ static MSVCRT_intptr_t msvcrt_spawn(int flags, const MSVCRT_wchar_t* exe, MSVCRT memset(&si, 0, sizeof(si)); si.cb = sizeof(si); msvcrt_create_io_inherit_block(&si.cbReserved2, &si.lpReserved2); + if (flags == MSVCRT__P_DETACH) create_flags |= DETACHED_PROCESS; if (!CreateProcessW(fullname, cmdline, NULL, NULL, TRUE, - flags == MSVCRT__P_DETACH ? DETACHED_PROCESS : 0, - env, NULL, &si, &pi)) + create_flags, env, NULL, &si, &pi)) { msvcrt_set_errno(GetLastError()); MSVCRT_free(si.lpReserved2);

1 0

André Hentschel : kernel32/tests: Remove unused code (Clang).
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: 7b318b1700d9f3b084eb432b763cd31e67983172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b318b1700d9f3b084eb432b7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:54:27 2014 +0100 kernel32/tests: Remove unused code (Clang). --- dlls/kernel32/tests/resource.c | 63 ++++++++++-------------------------------- 1 file changed, 15 insertions(+), 48 deletions(-) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 43551fa..74066cf 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -39,15 +39,8 @@ static const IMAGE_SECTION_HEADER sh_rodata_1 = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ }; -/* rodata @ [0x1000-0x4000) */ -static const IMAGE_SECTION_HEADER sh_rodata_2 = -{ - ".rodata", {3*page_size}, page_size, 3*page_size, page_size, 0, 0, 0, 0, - IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ -}; - /* rodata @ [0x1000-0x2000) */ -static const IMAGE_SECTION_HEADER sh_rodata_3 = +static const IMAGE_SECTION_HEADER sh_rodata_2 = { ".rodata", {page_size}, page_size, page_size, page_size, 0, 0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ @@ -60,50 +53,36 @@ static const IMAGE_SECTION_HEADER sh_rsrc_1 = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ }; -/* rsrc @ [0x4000-0x5000) */ -static const IMAGE_SECTION_HEADER sh_rsrc_2 = -{ - ".rsrc\0\0", {page_size}, 4*page_size, page_size, 4*page_size, 0, 0, 0, 0, - IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ -}; - /* rsrc @ [0x2000-0x4000) */ -static const IMAGE_SECTION_HEADER sh_rsrc_3 = +static const IMAGE_SECTION_HEADER sh_rsrc_2 = { ".rsrc\0\0", {2*page_size}, rva_rsrc_start-page_size, 2*page_size, rva_rsrc_start-page_size, 0, 0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ }; /* rsrc @ [0x2000-0x3000) */ -static const IMAGE_SECTION_HEADER sh_rsrc_4 = +static const IMAGE_SECTION_HEADER sh_rsrc_3 = { ".rsrc\0\0", {page_size}, rva_rsrc_start-page_size, page_size, rva_rsrc_start-page_size, 0, 0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ }; /* rsrc @ [0x3000-0x6000) */ -static const IMAGE_SECTION_HEADER sh_rsrc_5 = +static const IMAGE_SECTION_HEADER sh_rsrc_4 = { ".rsrc\0\0", {3*page_size}, rva_rsrc_start, 3*page_size, rva_rsrc_start, 0, 0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ }; -/* rsrc @ [0x4000-0x7000) */ -static const IMAGE_SECTION_HEADER sh_rsrc_6 = -{ - ".rsrc\0\0", {3*page_size}, 4*page_size, 3*page_size, 4*page_size, 0, 0, 0, 0, - IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ -}; - /* rsrc @ [0x2000-0x5000) */ -static const IMAGE_SECTION_HEADER sh_rsrc_7 = +static const IMAGE_SECTION_HEADER sh_rsrc_5 = { ".rsrc\0\0", {3*page_size}, 2*page_size, 3*page_size, 2*page_size, 0, 0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ }; /* rsrc @ [0x3000-0x4000), small SizeOfRawData */ -static const IMAGE_SECTION_HEADER sh_rsrc_8 = +static const IMAGE_SECTION_HEADER sh_rsrc_6 = { ".rsrc\0\0", {page_size}, rva_rsrc_start, 8, rva_rsrc_start, 0, 0, 0, 0, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ @@ -148,29 +127,17 @@ static const struct _sec_variants {{&sh_rodata_1, &sh_rsrc_1, NULL}, 4*page_size, 1, 0, 0}, {{&sh_rodata_1, &sh_rsrc_1, NULL}, 4*page_size, 1, 0, 0}, {{&sh_rodata_1, &sh_rsrc_1, NULL}, 4*page_size, 1, 0, 1}, - {{&sh_rodata_1, &sh_rsrc_5, NULL}, 6*page_size, 1, 0, 1} - }, - /* single .rodata section with compatible characteristics, data directory entry points to section end */ - /* Vista+ - existing section isn't used, new section is created at the end of file */ - /* NT4/2000/2003 - image is broken */ -#if 0 - { - {{&sh_rodata_2, NULL, NULL}}, - {{&sh_rodata_2, &sh_rsrc_2, NULL}, 5*page_size, 1, 0, 0}, - {{&sh_rodata_2, &sh_rsrc_2, NULL}, 5*page_size, 1, 0, 0}, - {{&sh_rodata_2, &sh_rsrc_2, NULL}, 5*page_size, 1, 0, 1}, - {{&sh_rodata_2, &sh_rsrc_6, NULL}, 7*page_size, 1, 0, 1} + {{&sh_rodata_1, &sh_rsrc_4, NULL}, 6*page_size, 1, 0, 1} }, -#endif /* .rsrc is the last section, data directory entry points to section end */ /* Vista+ - resources are moved to section start (trashing data that could be there), and section is trimmed */ /* NT4/2000/2003 - resources are moved to section start (trashing data that could be there); section isn't trimmed */ { - {{&sh_rodata_3, &sh_rsrc_3, NULL}}, - {{&sh_rodata_3, &sh_rsrc_4, NULL}, 3*page_size, 1, 0, 0}, - {{&sh_rodata_3, &sh_rsrc_4, NULL}, 3*page_size, 1, 0, 0}, - {{&sh_rodata_3, &sh_rsrc_4, NULL}, 3*page_size, 1, 0, 1}, - {{&sh_rodata_3, &sh_rsrc_7, NULL}, 5*page_size, 1, 0, 1} + {{&sh_rodata_2, &sh_rsrc_2, NULL}}, + {{&sh_rodata_2, &sh_rsrc_3, NULL}, 3*page_size, 1, 0, 0}, + {{&sh_rodata_2, &sh_rsrc_3, NULL}, 3*page_size, 1, 0, 0}, + {{&sh_rodata_2, &sh_rsrc_3, NULL}, 3*page_size, 1, 0, 1}, + {{&sh_rodata_2, &sh_rsrc_5, NULL}, 5*page_size, 1, 0, 1} }, /* .rsrc is not the last section */ /* section is reused; sections after .rsrc are shifted to give space to rsrc (in-image offset and RVA!) */ @@ -179,15 +146,15 @@ static const struct _sec_variants {{&sh_rodata_1, &sh_rsrc_1, &sh_junk}, 5*page_size, 1, 0, 0}, {{&sh_rodata_1, &sh_rsrc_1, &sh_junk}, 5*page_size, 1, 0, 0}, {{&sh_rodata_1, &sh_rsrc_1, &sh_junk}, 5*page_size, 1, 0, 1}, - {{&sh_rodata_1, &sh_rsrc_5, &sh_junk_2}, 7*page_size, 1, 0, 1} + {{&sh_rodata_1, &sh_rsrc_4, &sh_junk_2}, 7*page_size, 1, 0, 1} }, /* .rsrc is the last section, data directory entry points to whole section, file size is not aligned on FileAlign */ { - {{&sh_rodata_1, &sh_rsrc_8, NULL}}, + {{&sh_rodata_1, &sh_rsrc_6, NULL}}, {{&sh_rodata_1, &sh_rsrc_1, NULL}, 4*page_size, 1, 0, 0}, {{&sh_rodata_1, &sh_rsrc_1, NULL}, 4*page_size, 1, 0, 0}, {{&sh_rodata_1, &sh_rsrc_1, NULL}, 4*page_size, 1, 0, 1}, - {{&sh_rodata_1, &sh_rsrc_5, NULL}, 6*page_size, 1, 0, 1} + {{&sh_rodata_1, &sh_rsrc_4, NULL}, 6*page_size, 1, 0, 1} } };

1 0

André Hentschel : windowscodecs: Remove unused strings (Clang).
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: ef9562a42fcd86501157e3170bcc572334157bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9562a42fcd86501157e3170… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:53:44 2014 +0100 windowscodecs: Remove unused strings (Clang). --- dlls/windowscodecs/regsvr.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 4c86478..91df294 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -154,21 +154,6 @@ static HRESULT unregister_pixelformats(struct regsvr_pixelformat const *list); */ static const WCHAR clsid_keyname[] = { 'C', 'L', 'S', 'I', 'D', 0 }; -static const WCHAR curver_keyname[] = { - 'C', 'u', 'r', 'V', 'e', 'r', 0 }; -static const WCHAR ips_keyname[] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - 0 }; -static const WCHAR ips32_keyname[] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - '3', '2', 0 }; -static const WCHAR progid_keyname[] = { - 'P', 'r', 'o', 'g', 'I', 'D', 0 }; -static const WCHAR viprogid_keyname[] = { - 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', - 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', - 0 }; -static const char tmodel_valuename[] = "ThreadingModel"; static const char author_valuename[] = "Author"; static const char friendlyname_valuename[] = "FriendlyName"; static const WCHAR vendor_valuename[] = {'V','e','n','d','o','r',0};

1 0

André Hentschel : wineoss.drv: Remove unused string ( Clang).
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: d12e65af70d9c17e4082365dae05fdb73aec3526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12e65af70d9c17e4082365da… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:53:48 2014 +0100 wineoss.drv: Remove unused string (Clang). --- dlls/wineoss.drv/mmdevdrv.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ce95138..d64fa54 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -150,9 +150,6 @@ typedef struct _OSSDevice { static struct list g_devices = LIST_INIT(g_devices); -static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','o','s','s','.','d','r','v',0}; static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','o','s','s','.','d','r','v','\\','d','e','v','i','c','e','s',0};

1 0

Andrew Eikum : Revert "winmm: Increase mmdevapi buffer sizes.".
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: 5b7e49e84a44be9b837716d60961646e4cee0933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7e49e84a44be9b837716d60… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 3 13:56:53 2014 -0600 Revert "winmm: Increase mmdevapi buffer sizes.". This reverts commit fdfff7cf6013a030f2b240b13b02831e502d49e7. In theory, this commit should have had no affect on winmm-using applications and just prevented underruns on the mmdevapi side. But Patrol Falcon abuses the winmm API by modifying the buffer after passing it to waveOutWrite, and this patch breaks that behavior. We've improved the winecoreaudio driver since this patch was sent, and so large buffers should no longer be necessary to avoid underruns. --- dlls/winmm/waveform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 8d7f8ad..32083b8 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -68,8 +68,8 @@ static const WCHAR muteW[] = {'M','u','t','e',0}; * - We must be able to identify bad devices without crashing. */ -/* buffer size = 100 * 100000 (100 ns) = 1 second */ -#define AC_BUFLEN (100 * 100000) +/* buffer size = 10 * 100000 (100 ns) = 0.1 seconds */ +#define AC_BUFLEN (10 * 100000) #define MAX_DEVICES 256 #define MAPPER_INDEX 0x3F

1 0

André Hentschel : user32/tests: Remove unused variables (Clang).
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: f5f0b8bbc6d49d9c9cc449fc80de1a4145b68088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f0b8bbc6d49d9c9cc449fc8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:53:38 2014 +0100 user32/tests: Remove unused variables (Clang). --- dlls/user32/tests/msg.c | 112 ------------------------------------------------ 1 file changed, 112 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 778b3cf..b243a74 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1172,51 +1172,6 @@ static const struct message WmDestroyInvisibleChildSeq[] = { { WM_NCDESTROY, sent }, { 0 } }; -/* Moving the mouse in nonclient area */ -static const struct message WmMouseMoveInNonClientAreaSeq[] = { /* FIXME: add */ - { WM_NCHITTEST, sent }, - { WM_SETCURSOR, sent }, - { WM_NCMOUSEMOVE, posted }, - { 0 } -}; -/* Moving the mouse in client area */ -static const struct message WmMouseMoveInClientAreaSeq[] = { /* FIXME: add */ - { WM_NCHITTEST, sent }, - { WM_SETCURSOR, sent }, - { WM_MOUSEMOVE, posted }, - { 0 } -}; -/* Moving by dragging the title bar (after WM_NCHITTEST and WM_SETCURSOR) (outline move) */ -static const struct message WmDragTitleBarSeq[] = { /* FIXME: add */ - { WM_NCLBUTTONDOWN, sent|wparam, HTCAPTION }, - { WM_SYSCOMMAND, sent|defwinproc|wparam, SC_MOVE+2 }, - { WM_GETMINMAXINFO, sent|defwinproc }, - { WM_ENTERSIZEMOVE, sent|defwinproc }, - { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, 0 }, - { WM_MOVE, sent|defwinproc }, - { WM_EXITSIZEMOVE, sent|defwinproc }, - { 0 } -}; -/* Sizing by dragging the thick borders (after WM_NCHITTEST and WM_SETCURSOR) (outline move) */ -static const struct message WmDragThickBordersBarSeq[] = { /* FIXME: add */ - { WM_NCLBUTTONDOWN, sent|wparam, 0xd }, - { WM_SYSCOMMAND, sent|defwinproc|wparam, 0xf004 }, - { WM_GETMINMAXINFO, sent|defwinproc }, - { WM_ENTERSIZEMOVE, sent|defwinproc }, - { WM_SIZING, sent|defwinproc|wparam, 4}, /* one for each mouse movement */ - { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, 0 }, - { WM_GETMINMAXINFO, sent|defwinproc }, - { WM_NCCALCSIZE, sent|defwinproc|wparam, 1 }, - { WM_NCPAINT, sent|defwinproc|wparam, 1 }, - { WM_GETTEXT, sent|defwinproc }, - { WM_ERASEBKGND, sent|defwinproc }, - { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, 0 }, - { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, - { WM_EXITSIZEMOVE, sent|defwinproc }, - { 0 } -}; /* Resizing child window with MoveWindow (32) */ static const struct message WmResizingChildWithMoveWindowSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE }, @@ -1229,41 +1184,6 @@ static const struct message WmResizingChildWithMoveWindowSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; -/* Clicking on inactive button */ -static const struct message WmClickInactiveButtonSeq[] = { /* FIXME: add */ - { WM_NCHITTEST, sent }, - { WM_PARENTNOTIFY, sent|parent|wparam, WM_LBUTTONDOWN }, - { WM_MOUSEACTIVATE, sent }, - { WM_MOUSEACTIVATE, sent|parent|defwinproc }, - { WM_SETCURSOR, sent }, - { WM_SETCURSOR, sent|parent|defwinproc }, - { WM_LBUTTONDOWN, posted }, - { WM_KILLFOCUS, posted|parent }, - { WM_SETFOCUS, posted }, - { WM_CTLCOLORBTN, posted|parent }, - { BM_SETSTATE, posted }, - { WM_CTLCOLORBTN, posted|parent }, - { WM_LBUTTONUP, posted }, - { BM_SETSTATE, posted }, - { WM_CTLCOLORBTN, posted|parent }, - { WM_COMMAND, posted|parent }, - { 0 } -}; -/* Reparenting a button (16/32) */ -/* The last child (button) reparented gets topmost for its new parent. */ -static const struct message WmReparentButtonSeq[] = { /* FIXME: add */ - { WM_SHOWWINDOW, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE }, - { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, - { WM_ERASEBKGND, sent|parent }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, - { WM_CHILDACTIVATE, sent }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOREDRAW }, - { WM_MOVE, sent|defwinproc }, - { WM_SHOWWINDOW, sent|wparam, 1 }, - { 0 } -}; /* Creation of a custom dialog (32) */ static const struct message WmCreateCustomDialogSeq[] = { { HCBT_CREATEWND, hook }, @@ -1464,35 +1384,6 @@ static const struct message WmModalDialogSeq[] = { { WM_NCDESTROY, sent }, { 0 } }; -/* Creation of a modal dialog that is resized inside WM_INITDIALOG (32) */ -static const struct message WmCreateModalDialogResizeSeq[] = { /* FIXME: add */ - /* (inside dialog proc, handling WM_INITDIALOG) */ - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_NCCALCSIZE, sent }, - { WM_NCACTIVATE, sent|parent|wparam, 0 }, - { WM_GETTEXT, sent|defwinproc }, - { WM_ACTIVATE, sent|parent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|parent }, - { WM_NCACTIVATE, sent|wparam, 1 }, - { WM_ACTIVATE, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGED, sent|wparam, 0 }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, - /* (setting focus) */ - { WM_SHOWWINDOW, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_NCPAINT, sent }, - { WM_GETTEXT, sent|defwinproc }, - { WM_ERASEBKGND, sent }, - { WM_CTLCOLORDLG, sent|defwinproc }, - { WM_WINDOWPOSCHANGED, sent|wparam, 0 }, - { WM_PAINT, sent }, - /* (bunch of WM_CTLCOLOR* for each control) */ - { WM_PAINT, sent|parent }, - { WM_ENTERIDLE, sent|parent|wparam, 0 }, - { WM_SETCURSOR, sent|parent }, - { 0 } -}; /* SetMenu for NonVisible windows with size change*/ static const struct message WmSetMenuNonVisibleSizeChangeSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -14107,9 +13998,6 @@ static const struct message WmSetFocus_3[] = { { HCBT_SETFOCUS, hook }, /* child */ { 0 } }; -static const struct message WmSetFocus_4[] = { - { 0 } -}; static void test_SetFocus(void) {

1 0

André Hentschel : wintrust: Remove unused variable ( Clang).
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: dc4d32953fd0fde76974c798e22cf18b174bd260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4d32953fd0fde76974c798e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:53:35 2014 +0100 wintrust: Remove unused variable (Clang). --- dlls/wintrust/tests/asn.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index a9955ac..82feac6 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -305,8 +305,6 @@ static void test_decodeSPCLink(void) static const BYTE emptySequence[] = { 0x30,0x00 }; static BYTE flags[] = { 1 }; static const BYTE onlyFlagsPEImage[] = { 0x30,0x04,0x03,0x02,0x00,0x01 }; -static const BYTE moreFlagsPEImage[] = { -0x30,0x06,0x03,0x04,0x04,0xff,0x80,0x10 }; static const BYTE onlyEmptyFilePEImage[] = { 0x30,0x06,0xa0,0x04,0xa2,0x02,0x80,0x00 }; static const BYTE flagsAndEmptyFilePEImage[] = {

1 0

André Hentschel : winedbg: Remove unused code (Clang) .
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: 657933e135265ffd221c9003603fa147ba0da3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=657933e135265ffd221c90036… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:53:31 2014 +0100 winedbg: Remove unused code (Clang). --- programs/winedbg/break.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index eed03d9..c0d5663 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -492,14 +492,6 @@ void break_delete_xpoint(int num) bp[num].skipcount = 0; } -static inline BOOL module_is_container(const IMAGEHLP_MODULE* wmod_cntnr, - const IMAGEHLP_MODULE* wmod_child) -{ - return wmod_cntnr->BaseOfImage <= wmod_child->BaseOfImage && - wmod_cntnr->BaseOfImage + wmod_cntnr->ImageSize >= - wmod_child->BaseOfImage + wmod_child->ImageSize; -} - /****************************************************************** * break_delete_xpoints_from_module *

1 0

Andrew Eikum : dsound: Report buffer notifications in offset order.
by Alexandre Julliard Dec. 4, 2014

Dec. 4, 2014

Module: wine Branch: master Commit: ee126c96f128fdd52aca763ce89f08bc156556d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee126c96f128fdd52aca763ce… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 3 14:06:38 2014 -0600 dsound: Report buffer notifications in offset order. --- dlls/dsound/buffer.c | 22 +++++++++++ dlls/dsound/mixer.c | 99 +++++++++++++++++++++++++++------------------- dlls/dsound/tests/dsound.c | 84 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 40 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index e8fc5f3..9794b84 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -81,6 +81,27 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) return ref; } +static int notify_compar(const void *l, const void *r) +{ + const DSBPOSITIONNOTIFY *left = l; + const DSBPOSITIONNOTIFY *right = r; + + /* place DSBPN_OFFSETSTOP at the start of the sorted array */ + if(left->dwOffset == DSBPN_OFFSETSTOP){ + if(right->dwOffset != DSBPN_OFFSETSTOP) + return -1; + }else if(right->dwOffset == DSBPN_OFFSETSTOP) + return 1; + + if(left->dwOffset == right->dwOffset) + return 0; + + if(left->dwOffset < right->dwOffset) + return -1; + + return 1; +} + static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSoundNotify *iface, DWORD howmuch, const DSBPOSITIONNOTIFY *notify) { @@ -113,6 +134,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSou } CopyMemory(This->notifies, notify, howmuch * sizeof(DSBPOSITIONNOTIFY)); This->nrofnotifies = howmuch; + qsort(This->notifies, howmuch, sizeof(DSBPOSITIONNOTIFY), notify_compar); } else { HeapFree(GetProcessHeap(), 0, This->notifies); This->notifies = NULL; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 43b7dca..8d6b379 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -183,48 +183,67 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) */ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) { - int i; - DWORD offset; - LPDSBPOSITIONNOTIFY event; - TRACE("(%p,%d)\n",dsb,len); + int first, left, right, check; - if (dsb->nrofnotifies == 0) - return; + if(dsb->nrofnotifies == 0) + return; - TRACE("(%p) buflen = %d, playpos = %d, len = %d\n", - dsb, dsb->buflen, playpos, len); - for (i = 0; i < dsb->nrofnotifies ; i++) { - event = dsb->notifies + i; - offset = event->dwOffset; - TRACE("checking %d, position %d, event = %p\n", - i, offset, event->hEventNotify); - /* DSBPN_OFFSETSTOP has to be the last element. So this is */ - /* OK. [Inside DirectX, p274] */ - /* Windows does not seem to enforce this, and some apps rely */ - /* on that, so we can't stop there. */ - /* */ - /* This also means we can't sort the entries by offset, */ - /* because DSBPN_OFFSETSTOP == -1 */ - if (offset == DSBPN_OFFSETSTOP) { - if (dsb->state == STATE_STOPPED) { - SetEvent(event->hEventNotify); - TRACE("signalled event %p (%d)\n", event->hEventNotify, i); - } - continue; - } - if ((playpos + len) >= dsb->buflen) { - if ((offset < ((playpos + len) % dsb->buflen)) || - (offset >= playpos)) { - TRACE("signalled event %p (%d)\n", event->hEventNotify, i); - SetEvent(event->hEventNotify); - } - } else { - if ((offset >= playpos) && (offset < (playpos + len))) { - TRACE("signalled event %p (%d)\n", event->hEventNotify, i); - SetEvent(event->hEventNotify); - } - } - } + if(dsb->state == STATE_STOPPED){ + TRACE("Stopped...\n"); + /* DSBPN_OFFSETSTOP notifies are always at the start of the sorted array */ + for(left = 0; left < dsb->nrofnotifies; ++left){ + if(dsb->notifies[left].dwOffset != DSBPN_OFFSETSTOP) + break; + + TRACE("Signalling %p\n", dsb->notifies[left].hEventNotify); + SetEvent(dsb->notifies[left].hEventNotify); + } + return; + } + + for(first = 0; first < dsb->nrofnotifies && dsb->notifies[first].dwOffset == DSBPN_OFFSETSTOP; ++first) + ; + + if(first == dsb->nrofnotifies) + return; + + check = left = first; + right = dsb->nrofnotifies - 1; + + /* find leftmost notify that is greater than playpos */ + while(left != right){ + check = left + (right - left) / 2; + if(dsb->notifies[check].dwOffset < playpos) + left = check + 1; + else if(dsb->notifies[check].dwOffset > playpos) + right = check; + else{ + left = check; + break; + } + } + + TRACE("Not stopped: first notify: %u (%u), range: [%u,%u)\n", first, + dsb->notifies[check].dwOffset, playpos, (playpos + len) % dsb->buflen); + + /* send notifications in range */ + for(check = left; check < dsb->nrofnotifies; ++check){ + if(dsb->notifies[check].dwOffset >= playpos + len) + break; + + TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); + SetEvent(dsb->notifies[check].hEventNotify); + } + + if(playpos + len > dsb->buflen){ + for(check = first; check < left; ++check){ + if(dsb->notifies[check].dwOffset >= (playpos + len) % dsb->buflen) + break; + + TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); + SetEvent(dsb->notifies[check].hEventNotify); + } + } } static inline float get_current_sample(const IDirectSoundBufferImpl *dsb, diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 10a1032..1df7ce4 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1486,6 +1486,89 @@ done: return S_OK; } +static void test_notifications(LPGUID lpGuid) +{ + HRESULT rc; + IDirectSound *dso; + IDirectSoundBuffer *buf; + IDirectSoundNotify *buf_notif; + DSBUFFERDESC bufdesc; + WAVEFORMATEX wfx; + DSBPOSITIONNOTIFY notifies[2]; + HANDLE handles[2]; + DWORD expect; + int cycles; + + rc = pDirectSoundCreate(lpGuid, &dso, NULL); + ok(rc == DS_OK || rc == DSERR_NODRIVER || rc == DSERR_ALLOCATED, + "DirectSoundCreate() failed: %08x\n", rc); + if(rc != DS_OK) + return; + + rc = IDirectSound_SetCooperativeLevel(dso, get_hwnd(), DSSCL_PRIORITY); + ok(rc == DS_OK, "IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + if(rc != DS_OK){ + IDirectSound_Release(dso); + return; + } + + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.nChannels = 1; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + wfx.cbSize = 0; + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_CTRLPOSITIONNOTIFY; + bufdesc.dwBufferBytes = wfx.nSamplesPerSec * wfx.nBlockAlign / 2; /* 0.5s */ + bufdesc.lpwfxFormat = &wfx; + rc = IDirectSound_CreateSoundBuffer(dso, &bufdesc, &buf, NULL); + ok(rc == DS_OK && buf != NULL, "IDirectSound_CreateSoundBuffer() failed " + "to create a buffer %08x\n", rc); + + rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&buf_notif); + ok(rc == DS_OK, "QueryInterface(IID_IDirectSoundNotify): %08x\n", rc); + + /* create notifications at each end of the buffer */ + notifies[0].dwOffset = 0; + handles[0] = notifies[0].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL); + notifies[1].dwOffset = bufdesc.dwBufferBytes - 1; + handles[1] = notifies[1].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL); + + rc = IDirectSoundNotify_SetNotificationPositions(buf_notif, 2, notifies); + ok(rc == DS_OK, "SetNotificationPositions: %08x\n", rc); + + IDirectSoundNotify_Release(buf_notif); + + rc = IDirectSoundBuffer_Play(buf, 0, 0, DSBPLAY_LOOPING); + ok(rc == DS_OK, "Play: %08x\n", rc); + + expect = 0; + for(cycles = 0; cycles < 6 /* 1.5s */; ++cycles){ + DWORD wait; + + /* since the notifications are on opposite ends of the entire buffer, + * they should arrive well-ordered in an alternating sequence. */ + wait = WaitForMultipleObjects(2, handles, FALSE, 1000); + ok(wait <= WAIT_OBJECT_0 + 1 && wait - WAIT_OBJECT_0 == expect, + "Got unexpected notification order or timeout: %u\n", wait); + + expect = !expect; + } + + rc = IDirectSoundBuffer_Stop(buf); + ok(rc == DS_OK, "Stop: %08x\n", rc); + + CloseHandle(notifies[0].hEventNotify); + CloseHandle(notifies[1].hEventNotify); + + IDirectSoundBuffer_Release(buf); + IDirectSound_Release(dso); +} + static unsigned int number; static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, @@ -1516,6 +1599,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, test_frequency(lpGuid); test_duplicate(lpGuid); test_invalid_fmts(lpGuid); + test_notifications(lpGuid); } return TRUE;

1 0