October 2009 - Wine-Commits

Christian Costa : d3dxof: Only consider 4 lowest bits in DXFILELOADOPTIONS + tests.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

Module: wine Branch: master Commit: c94763b4204cf10dd79af215aa51b5715dfd6c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94763b4204cf10dd79af215a… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Oct 23 08:41:04 2009 +0200 d3dxof: Only consider 4 lowest bits in DXFILELOADOPTIONS + tests. --- dlls/d3dxof/d3dxof.c | 3 ++ dlls/d3dxof/tests/d3dxof.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 5d42d53..cd4690d 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -142,6 +142,9 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV if (!ppEnumObj) return DXFILEERR_BADVALUE; + /* Only lowest 4 bits are relevant in DXFILELOADOPTIONS */ + dwLoadOptions &= 0xF; + if (dwLoadOptions == DXFILELOAD_FROMFILE) { TRACE("Open source file '%s'\n", (char*)pvSource); diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index aec29b0..9f1295f 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -137,6 +137,59 @@ static void test_refcount(void) ok(ref == 0, "Got refcount %d, expected 0\n", ref); } +static void test_CreateEnumObject(void) +{ + HRESULT hr; + ULONG ref; + LPDIRECTXFILE lpDirectXFile = NULL; + LPDIRECTXFILEENUMOBJECT lpdxfeo; + LPDIRECTXFILEDATA lpdxfd; + DXFILELOADMEMORY dxflm; + BYTE* pdata; + DWORD size; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + hr = pDirectXFileCreate(&lpDirectXFile); + ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); + if(!lpDirectXFile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, strlen(template)); + ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); + + dxflm.lpMemory = &object; + dxflm.dSize = strlen(object); + /* Check that only lowest 4 bits are relevant in DXFILELOADOPTIONS */ + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, 0xFFFFFFF0 + DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + + hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&pdata); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + + ok(size == 8, "Retreived data size is wrong\n"); + ok((*((WORD*)pdata) == 1) && (*((WORD*)(pdata+2)) == 2) && (*((DWORD*)(pdata+4)) == 3), "Retreived data is wrong\n"); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + + ref = IDirectXFile_Release(lpDirectXFile); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); +} + /* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 @@ -310,6 +363,7 @@ START_TEST(d3dxof) init_function_pointers(); test_refcount(); + test_CreateEnumObject(); test_dump(); FreeLibrary(hd3dxof);

1 0

Paul Vriens : user32/tests: Skip some tests on Win9x/WinMe.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

Module: wine Branch: master Commit: 05765a0b0c0f0b3caa8cb4ad10a2a206ddf7f913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05765a0b0c0f0b3caa8cb4ad1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 23 15:03:12 2009 +0200 user32/tests: Skip some tests on Win9x/WinMe. --- dlls/user32/tests/input.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 42d9544..d82ef3c 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -904,7 +904,12 @@ static void test_Input_blackbox(void) SetWindowPos( window, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); SetForegroundWindow( window ); - hook = SetWindowsHookExA(WH_KEYBOARD_LL, hook_proc, GetModuleHandleA( NULL ), 0); + if (!(hook = SetWindowsHookExA(WH_KEYBOARD_LL, hook_proc, GetModuleHandleA( NULL ), 0))) + { + DestroyWindow(window); + win_skip("WH_KEYBOARD_LL is not supported\n"); + return; + } /* must process all initial messages, otherwise X11DRV_KeymapNotify unsets * key state set by SendInput(). */

1 0

Alexandre Julliard : user32: Fix the return value of EnumThreadWindows.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

Module: wine Branch: master Commit: 1b27890af69f78f657ddac886b9eaecf4372cf28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b27890af69f78f657ddac886… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 14:46:58 2009 +0200 user32: Fix the return value of EnumThreadWindows. --- dlls/user32/tests/win.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/win.c | 5 ++- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 63f25bc..1c9103a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -569,6 +569,60 @@ static void test_parent_owner(void) DestroyWindow( owner ); } +static BOOL CALLBACK enum_proc( HWND hwnd, LPARAM lParam) +{ + (*(LPINT)lParam)++; + if (*(LPINT)lParam > 2) return FALSE; + return TRUE; +} +static DWORD CALLBACK enum_thread( void *arg ) +{ + INT count; + HWND hwnd[3]; + BOOL ret; + MSG msg; + + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); /* make sure we have a message queue */ + + count = 0; + ret = EnumThreadWindows( GetCurrentThreadId(), enum_proc, (LPARAM)&count ); + ok( ret, "EnumThreadWindows should have returned TRUE\n" ); + ok( count == 0, "count should be 0 got %d\n", count ); + + hwnd[0] = CreateWindowExA(0, "ToolWindowClass", "Tool window 1", WS_POPUP, + 0, 0, 100, 100, 0, 0, 0, NULL ); + count = 0; + ret = EnumThreadWindows( GetCurrentThreadId(), enum_proc, (LPARAM)&count ); + ok( ret, "EnumThreadWindows should have returned TRUE\n" ); + if (count != 2) /* Vista gives us two windows for the price of one */ + { + ok( count == 1, "count should be 1 got %d\n", count ); + hwnd[2] = CreateWindowExA(0, "ToolWindowClass", "Tool window 2", WS_POPUP, + 0, 0, 100, 100, 0, 0, 0, NULL ); + } + else hwnd[2] = 0; + + hwnd[1] = CreateWindowExA(0, "ToolWindowClass", "Tool window 3", WS_POPUP, + 0, 0, 100, 100, 0, 0, 0, NULL ); + count = 0; + ret = EnumThreadWindows( GetCurrentThreadId(), enum_proc, (LPARAM)&count ); + ok( !ret, "EnumThreadWindows should have returned FALSE\n" ); + ok( count == 3, "count should be 1 got %d\n", count ); + + if (hwnd[2]) DestroyWindow(hwnd[2]); + DestroyWindow(hwnd[1]); + DestroyWindow(hwnd[0]); + return 0; +} + +/* test EnumThreadWindows in a separate thread */ +static void test_enum_thread_windows(void) +{ + DWORD id; + HANDLE handle = CreateThread( NULL, 0, enum_thread, 0, 0, &id ); + ok( !WaitForSingleObject( handle, 10000 ), "wait failed\n" ); + CloseHandle( handle ); +} static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -5762,6 +5816,7 @@ START_TEST(win) test_CreateWindow(); test_parent_owner(); test_SetParent(); + test_enum_thread_windows(); test_mdi(); test_icons(); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3e6dc37..d6746b0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3151,6 +3151,7 @@ BOOL WINAPI EnumThreadWindows( DWORD id, WNDENUMPROC func, LPARAM lParam ) { HWND *list; int i; + BOOL ret = TRUE; USER_CheckNotLock(); @@ -3159,9 +3160,9 @@ BOOL WINAPI EnumThreadWindows( DWORD id, WNDENUMPROC func, LPARAM lParam ) /* Now call the callback function for every window */ for (i = 0; list[i]; i++) - if (!func( list[i], lParam )) break; + if (!(ret = func( list[i], lParam ))) break; HeapFree( GetProcessHeap(), 0, list ); - return TRUE; + return ret; }

1 0

Nikolay Sivov : comctl32/tests: Explicitly initialize window handle.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

Module: wine Branch: master Commit: a04c6db804bc52082cf0064ca12e21b05be60352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04c6db804bc52082cf0064ca… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 23 14:46:43 2009 +0400 comctl32/tests: Explicitly initialize window handle. --- dlls/comctl32/tests/toolbar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index d0a444e..3b3708b 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -162,7 +162,7 @@ static void basic_test(void) static void rebuild_toolbar(HWND *hToolbar) { - if (*hToolbar != NULL) + if (*hToolbar) DestroyWindow(*hToolbar); *hToolbar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hMainWnd, (HMENU)5, GetModuleHandle(NULL), NULL); @@ -1082,7 +1082,7 @@ static void restore_recalc_state(HWND hToolbar) static void test_recalc(void) { - HWND hToolbar; + HWND hToolbar = NULL; TBBUTTONINFO bi; CHAR test[] = "Test"; const int EX_STYLES_COUNT = 5;

1 0

Eric Pouech : winmm: Get rid of 16bit driver support.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

Module: wine Branch: master Commit: ca1a7c6badb8cd8eea67cbeedde0ebae48fda5e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1a7c6badb8cd8eea67cbeed… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:11:15 2009 +0200 winmm: Get rid of 16bit driver support. --- dlls/winmm/driver.c | 135 ++---- dlls/winmm/lolvldrv.c | 143 +----- dlls/winmm/message16.c | 1168 ------------------------------------------------ dlls/winmm/mmsystem.c | 258 ----------- dlls/winmm/winemm.h | 47 +-- 5 files changed, 79 insertions(+), 1672 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca1a7c6badb8cd8eea67c…

1 0

Eric Pouech : winmm: Final split of mmsystem.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

Module: wine Branch: master Commit: a60dd6e9181abc6d94fce490152c0492597178c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60dd6e9181abc6d94fce4901… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:11:29 2009 +0200 winmm: Final split of mmsystem. --- .gitignore | 1 - configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 4 ---- dlls/mmsystem.dll16/Makefile.in | 18 ++++++++++++++++++ dlls/{winmm => mmsystem.dll16}/mci16.c | 0 dlls/{winmm => mmsystem.dll16}/message16.c | 0 dlls/{winmm => mmsystem.dll16}/mmio16.c | 0 dlls/{winmm => mmsystem.dll16}/mmsystem.c | 12 ++++++------ .../mmsystem.dll16.spec} | 0 dlls/{winmm => mmsystem.dll16}/winemm16.h | 0 dlls/winmm/Makefile.in | 9 --------- 12 files changed, 34 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 5d498c8..2ac3a69 100644 --- a/.gitignore +++ b/.gitignore @@ -64,7 +64,6 @@ dlls/krnl386.exe16 dlls/libd3dx9.def dlls/libwinspool.def dlls/libxinput.def -dlls/mmsystem.dll16 dlls/msdaps/msdaps.h dlls/msdaps/msdaps_i.c dlls/msdaps/msdaps_p.c diff --git a/configure b/configure index 1507ead..32e37b2 100755 --- a/configure +++ b/configure @@ -15351,6 +15351,14 @@ dlls/mmdevldr.vxd/Makefile: dlls/mmdevldr.vxd/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mmdevldr.vxd/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/mmsystem.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mmsystem.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/mmsystem.dll16/Makefile: dlls/mmsystem.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/mmsystem.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/monodebg.vxd/Makefile" test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ monodebg.vxd" @@ -18937,6 +18945,7 @@ do "dlls/mlang/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mlang/Makefile" ;; "dlls/mlang/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mlang/tests/Makefile" ;; "dlls/mmdevldr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevldr.vxd/Makefile" ;; + "dlls/mmsystem.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmsystem.dll16/Makefile" ;; "dlls/monodebg.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/monodebg.vxd/Makefile" ;; "dlls/mountmgr.sys/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mountmgr.sys/Makefile" ;; "dlls/mouse.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mouse.drv16/Makefile" ;; diff --git a/configure.ac b/configure.ac index 7fddf44..68f0f27 100644 --- a/configure.ac +++ b/configure.ac @@ -2305,6 +2305,7 @@ WINE_CONFIG_MAKEFILE([dlls/midimap/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL WINE_CONFIG_MAKEFILE([dlls/mlang/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mlang/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/mmdevldr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) +WINE_CONFIG_MAKEFILE([dlls/mmsystem.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/monodebg.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/mountmgr.sys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mouse.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 8dcfdab..92f129f 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -21,7 +21,6 @@ WIN16_FILES = \ commdlg.dll16 \ gdi.exe16 \ krnl386.exe16 \ - mmsystem.dll16 \ user.exe16 \ wprocs.dll16 @@ -48,9 +47,6 @@ user.exe16: wprocs.dll16: echo "winedos.dll" >$@ -mmsystem.dll16: - echo "winmm.dll" >$@ - # Import libraries STATIC_IMPLIBEXT = $(IMPLIBEXT:def=def.a) diff --git a/dlls/mmsystem.dll16/Makefile.in b/dlls/mmsystem.dll16/Makefile.in new file mode 100644 index 0000000..eb6c6f6 --- /dev/null +++ b/dlls/mmsystem.dll16/Makefile.in @@ -0,0 +1,18 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mmsystem.dll16 +IMPORTS = winmm user32 kernel32 + +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,winmm.dll + +C_SRCS = \ + mci16.c \ + message16.c \ + mmio16.c \ + mmsystem.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/winmm/mci16.c b/dlls/mmsystem.dll16/mci16.c similarity index 100% rename from dlls/winmm/mci16.c rename to dlls/mmsystem.dll16/mci16.c diff --git a/dlls/winmm/message16.c b/dlls/mmsystem.dll16/message16.c similarity index 100% rename from dlls/winmm/message16.c rename to dlls/mmsystem.dll16/message16.c diff --git a/dlls/winmm/mmio16.c b/dlls/mmsystem.dll16/mmio16.c similarity index 100% rename from dlls/winmm/mmio16.c rename to dlls/mmsystem.dll16/mmio16.c diff --git a/dlls/winmm/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c similarity index 99% rename from dlls/winmm/mmsystem.c rename to dlls/mmsystem.dll16/mmsystem.c index f258fee..a7578e7 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -452,12 +452,12 @@ UINT16 WINAPI auxGetDevCaps16(UINT16 uDeviceID, LPAUXCAPS16 lpCaps, UINT16 uSize ret = auxGetDevCapsA(uDeviceID, &acA, sizeof(acA)); if (ret == MMSYSERR_NOERROR) { AUXCAPS16 ac16; - ac16.wMid = acA.wMid; - ac16.wPid = acA.wPid; - ac16.vDriverVersion = acA.vDriverVersion; - strcpy(ac16.szPname, acA.szPname); - ac16.wTechnology = acA.wTechnology; - ac16.dwSupport = acA.dwSupport; + ac16.wMid = acA.wMid; + ac16.wPid = acA.wPid; + ac16.vDriverVersion = acA.vDriverVersion; + strcpy(ac16.szPname, acA.szPname); + ac16.wTechnology = acA.wTechnology; + ac16.dwSupport = acA.dwSupport; memcpy(lpCaps, &ac16, min(uSize, sizeof(ac16))); } return ret; diff --git a/dlls/winmm/mmsystem.spec b/dlls/mmsystem.dll16/mmsystem.dll16.spec similarity index 100% rename from dlls/winmm/mmsystem.spec rename to dlls/mmsystem.dll16/mmsystem.dll16.spec diff --git a/dlls/winmm/winemm16.h b/dlls/mmsystem.dll16/winemm16.h similarity index 100% rename from dlls/winmm/winemm16.h rename to dlls/mmsystem.dll16/winemm16.h diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index 416b56b..0848ca5 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -17,15 +17,6 @@ C_SRCS = \ time.c \ winmm.c -C_SRCS16 = \ - mci16.c \ - message16.c \ - mmio16.c \ - mmsystem.c - -SPEC_SRCS16 = \ - mmsystem.spec - RC_SRCS = \ winmm_Cs.rc \ winmm_Da.rc \

1 0

Christian Costa : d3dxof: Properly initialize nb_childs.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

Module: wine Branch: master Commit: b9561c9cf90f20f3bb32981fc3ba9c8e8bd21094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9561c9cf90f20f3bb32981fc… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Oct 23 08:40:48 2009 +0200 d3dxof: Properly initialize nb_childs. --- dlls/d3dxof/parsing.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index dc7b473..fb5ab4e 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1174,6 +1174,8 @@ static BOOL parse_object_members_list(parse_buffer * buf) static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) { + buf->pxo->nb_childs = 0; + if (!parse_object_members_list(buf)) return FALSE;

1 0

Eric Pouech : winmm: Get rid of 16bit driver support in mci.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

Module: wine Branch: master Commit: 2a581444d0b92f1a5bf2767f659d28cbc6b88e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a581444d0b92f1a5bf2767f6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:11:07 2009 +0200 winmm: Get rid of 16bit driver support in mci. --- dlls/winmm/mci.c | 51 +---- dlls/winmm/message16.c | 685 ------------------------------------------------ dlls/winmm/winemm.h | 3 - 3 files changed, 3 insertions(+), 736 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a581444d0b92f1a5bf27…

1 0

Eric Pouech : winmm: Simply use kernel32. {Release|Restore}ThunkLock instead of using 16bit convolutions.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

Module: wine Branch: master Commit: 14a68405d3295811fedce0c1da4fdb6e7d7a6936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a68405d3295811fedce0c1d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:11:01 2009 +0200 winmm: Simply use kernel32.{Release|Restore}ThunkLock instead of using 16bit convolutions. --- dlls/winmm/mmsystem.c | 4 ---- dlls/winmm/winemm.h | 2 -- dlls/winmm/winmm.c | 11 ++++------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index daf78d0..ce26192 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -90,16 +90,12 @@ BOOL WINAPI MMSYSTEM_LibMain(DWORD fdwReason, HINSTANCE hinstDLL, WORD ds, pFnOpenDriver16 = DRIVER_OpenDriver16; pFnCloseDriver16 = DRIVER_CloseDriver16; pFnSendMessage16 = DRIVER_SendMessage16; - pFnReleaseThunkLock = ReleaseThunkLock; - pFnRestoreThunkLock = RestoreThunkLock; MMDRV_Init16(); break; case DLL_PROCESS_DETACH: pFnOpenDriver16 = NULL; pFnCloseDriver16 = NULL; pFnSendMessage16 = NULL; - pFnReleaseThunkLock = NULL; - pFnRestoreThunkLock = NULL; /* FIXME: add equivalent for MMDRV_Init16() */ break; case DLL_THREAD_ATTACH: diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index a06daf2..4eabe70 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -201,8 +201,6 @@ extern WINMM_MapType (*pFnMciMapMsg32WTo16)(WORD,WORD,DWORD,DWORD_PTR*); extern WINMM_MapType (*pFnMciUnMapMsg32WTo16)(WORD,WORD,DWORD,DWORD_PTR); extern LRESULT (*pFnCallMMDrvFunc16)(DWORD /* in fact FARPROC16 */,WORD,WORD,LONG,LONG,LONG); extern unsigned (*pFnLoadMMDrvFunc16)(LPCSTR,LPWINE_DRIVER, LPWINE_MM_DRIVER); -extern void (WINAPI *pFnReleaseThunkLock)(DWORD*); -extern void (WINAPI *pFnRestoreThunkLock)(DWORD); /* GetDriverFlags() returned bits is not documented (nor the call itself) * Here are Wine only definitions of the bits diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 7855bc3..677bfa3 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -57,9 +57,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); -void (WINAPI *pFnReleaseThunkLock)(DWORD*); -void (WINAPI *pFnRestoreThunkLock)(DWORD); - /* ======================================================================== * G L O B A L S E T T I N G S * ========================================================================*/ @@ -1748,9 +1745,9 @@ static BOOL MMSYSTEM_MidiStream_PostMessage(WINE_MIDIStream* lpMidiStrm, WORD ms if (PostThreadMessageA(lpMidiStrm->dwThreadID, msg, pmt1, pmt2)) { DWORD count; - if (pFnReleaseThunkLock) pFnReleaseThunkLock(&count); + ReleaseThunkLock(&count); WaitForSingleObject(lpMidiStrm->hEvent, INFINITE); - if (pFnRestoreThunkLock) pFnRestoreThunkLock(count); + RestoreThunkLock(count); } else { WARN("bad PostThreadMessageA\n"); return FALSE; @@ -1836,9 +1833,9 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, * (meaning the Win16Lock is set), so that it's released and the 32 bit thread running * MMSYSTEM_MidiStreamPlayer can acquire Win16Lock to create its queue. */ - if (pFnReleaseThunkLock) pFnReleaseThunkLock(&count); + ReleaseThunkLock(&count); WaitForSingleObject(lpMidiStrm->hEvent, INFINITE); - if (pFnRestoreThunkLock) pFnRestoreThunkLock(count); + RestoreThunkLock(count); } TRACE("=> (%u/%d) hMidi=%p ret=%d lpMidiStrm=%p\n",

1 0

Eric Pouech : winmm: Duplicate the 16<> 32 time struct conversion functions in both DLLs.
by Alexandre Julliard Oct. 23, 2009

Oct. 23, 2009

Module: wine Branch: master Commit: 9709d1c67f09c5f9541b0cc12a8a31731a081799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9709d1c67f09c5f9541b0cc12… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:10:54 2009 +0200 winmm: Duplicate the 16<>32 time struct conversion functions in both DLLs. --- dlls/winmm/message16.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c index d13190e..0193683 100644 --- a/dlls/winmm/message16.c +++ b/dlls/winmm/message16.c @@ -33,6 +33,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); +/****************************************************************** + * WINMM_MMTIME16to32 + */ +static void WINMM_MMTIME16to32(LPMMTIME mmt32, const MMTIME16* mmt16) +{ + mmt32->wType = mmt16->wType; + /* layout of rest is the same for 32/16, + * Note: mmt16->u is 2 bytes smaller than mmt32->u, which has padding + */ + memcpy(&(mmt32->u), &(mmt16->u), sizeof(mmt16->u)); +} + + /************************************************************************** * MMDRV_Callback [internal] */ @@ -1165,7 +1178,7 @@ static WINMM_MapType MMDRV_WaveIn_UnMap32WTo16(UINT wMsg, DWORD_PTR *lpdwUser, LPSTR ptr = (LPSTR)mmt16 - sizeof(LPMMTIME); LPMMTIME mmt32 = *(LPMMTIME*)ptr; - MMSYSTEM_MMTIME16to32(mmt32, mmt16); + WINMM_MMTIME16to32(mmt32, mmt16); UnMapLS( *lpParam1 ); HeapFree( GetProcessHeap(), 0, ptr ); ret = WINMM_MAP_OK; @@ -1689,7 +1702,7 @@ static WINMM_MapType MMDRV_WaveOut_UnMap32WTo16(UINT wMsg, DWORD_PTR *lpdwUser, LPSTR ptr = (LPSTR)mmt16 - sizeof(LPMMTIME); LPMMTIME mmt32 = *(LPMMTIME*)ptr; - MMSYSTEM_MMTIME16to32(mmt32, mmt16); + WINMM_MMTIME16to32(mmt32, mmt16); UnMapLS( *lpParam1 ); HeapFree( GetProcessHeap(), 0, ptr ); ret = WINMM_MAP_OK;

1 0