wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Huw Davies : widl: Add support for parsing the annotation attribute.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: ab32b3df4df8adcee75e39b8bcc4e2330aa5b2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab32b3df4df8adcee75e39b8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 12:15:23 2009 +0000 widl: Add support for parsing the annotation attribute. --- tools/widl/parser.l | 1 + tools/widl/parser.y | 4 +++- tools/widl/widltypes.h | 1 + 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 55a73c7..f45b228 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -279,6 +279,7 @@ static const struct keyword attr_keywords[] = { {"aggregatable", tAGGREGATABLE}, {"allocate", tALLOCATE}, + {"annotation", tANNOTATION}, {"appobject", tAPPOBJECT}, {"async", tASYNC}, {"async_uuid", tASYNCUUID}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c2f1abc..b12741c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -194,7 +194,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %token EQUALITY INEQUALITY %token GREATEREQUAL LESSEQUAL %token LOGICALOR LOGICALAND -%token tAGGREGATABLE tALLOCATE tAPPOBJECT tASYNC tASYNCUUID +%token tAGGREGATABLE tALLOCATE tANNOTATION tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE @@ -472,6 +472,7 @@ str_list: aSTRING { $$ = append_str( NULL, $1 ); } attribute: { $$ = NULL; } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } + | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } | tASYNC { $$ = make_attr(ATTR_ASYNC); } | tAUTOHANDLE { $$ = make_attr(ATTR_AUTO_HANDLE); } @@ -1872,6 +1873,7 @@ struct allowed_attr allowed_attr[] = { /* attr { D ACF I Fn ARG T En St Un Fi L DI M C <display name> } */ /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "aggregatable" }, + /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, /* ATTR_APPOBJECT */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "appobject" }, /* ATTR_ASYNC */ { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "async" }, /* ATTR_AUTO_HANDLE */ { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "auto_handle" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index c1c07ea..e80c7ed 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -72,6 +72,7 @@ typedef struct list statement_list_t; enum attr_type { ATTR_AGGREGATABLE, + ATTR_ANNOTATION, ATTR_APPOBJECT, ATTR_ASYNC, ATTR_AUTO_HANDLE,

1 0

André Hentschel : appwiz: Ignore apps without title in the list.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: a5107da440d9933f69bc298ce86b1f0a51464129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5107da440d9933f69bc298ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 26 13:16:54 2009 +0100 appwiz: Ignore apps without title in the list. --- dlls/appwiz.cpl/appwiz.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 0d9e555..bafd319 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -340,13 +340,15 @@ end: */ static void AddApplicationsToList(HWND hWnd, HIMAGELIST hList) { - APPINFO *iter = AppInfo; + APPINFO *iter; LVITEMW lvItem; HICON hIcon; int index; - while (iter) + for (iter = AppInfo; iter; iter = iter->next) { + if (!iter->title[0]) continue; + /* get the icon */ index = 0; @@ -371,8 +373,6 @@ static void AddApplicationsToList(HWND hWnd, HIMAGELIST hList) /* now add the subitems (columns) */ ListView_SetItemTextW(hWnd, index, 1, iter->publisher); ListView_SetItemTextW(hWnd, index, 2, iter->version); - - iter = iter->next; } }

1 0

Huw Davies : rpcrt4: Move the full pointer table init to after a potential call to NdrServerInitializeNew ().
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: da86e727bd9e5bb3be00445afa51aca765d4f845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da86e727bd9e5bb3be00445af… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 11:33:39 2009 +0000 rpcrt4: Move the full pointer table init to after a potential call to NdrServerInitializeNew(). --- dlls/rpcrt4/ndr_stubless.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 8cb5f2b..8150238 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1299,10 +1299,6 @@ LONG WINAPI NdrStubCall2( TRACE("NDR Version: 0x%x\n", pStubDesc->Version); - /* create the full pointer translation tables, if requested */ - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) - stubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,XLAT_SERVER); - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; @@ -1377,6 +1373,10 @@ LONG WINAPI NdrStubCall2( else NdrServerInitializeNew(pRpcMsg, &stubMsg, pStubDesc); + /* create the full pointer translation tables, if requested */ + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) + stubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,XLAT_SERVER); + /* store the RPC flags away */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) pRpcMsg->RpcFlags = ((const NDR_PROC_HEADER_RPC *)pProcHeader)->rpc_flags;

1 0

Alexandre Julliard : winetest: Refuse to submit results if we are using native dlls.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 31a5f31127ee9959d191b34ab9ff4d02429dee79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31a5f31127ee9959d191b34ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 13:38:05 2009 +0100 winetest: Refuse to submit results if we are using native dlls. --- programs/winetest/main.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 2c9a57d..ee092e5 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -50,6 +50,7 @@ struct wine_test char *tag = NULL; static struct wine_test *wine_tests; static int nr_of_files, nr_of_tests; +static int nr_native_dlls; static const char whitespace[] = " \t\r\n"; static const char testexe[] = "_test.exe"; static char build_id[64]; @@ -679,6 +680,7 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, { FreeLibrary(dll); xprintf (" %s=load error Configured as native\n", dllname); + nr_native_dlls++; return TRUE; } if (!strcmp( dllname, "mshtml" ) && running_under_wine() && !gecko_check()) @@ -817,6 +819,9 @@ run_tests (char *logname, char *outdir) report (R_DELTA, 0, "Extracting: Done"); + if (nr_native_dlls) + report( R_WARNING, "Some dlls are configured as native, you won't be able to submit results." ); + report (R_STATUS, "Running tests"); report (R_PROGRESS, 1, nr_of_tests); for (i = 0; i < nr_of_files; i++) { @@ -1054,7 +1059,7 @@ int main( int argc, char *argv[] ) if (!logname) { logname = run_tests (NULL, outdir); - if (build_id[0] && !nb_filters && + if (build_id[0] && !nb_filters && !nr_native_dlls && report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES) if (!send_file (logname) && !DeleteFileA(logname)) report (R_WARNING, "Can't remove logfile: %u", GetLastError());

1 0

Louis Lenders : wuaueng: Add version resource.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: a4fcb9a8c6c9d3f6d081dd974fa3ed85cb9414b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fcb9a8c6c9d3f6d081dd974… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Oct 26 13:04:27 2009 +0100 wuaueng: Add version resource. --- dlls/wuaueng/Makefile.in | 2 ++ dlls/wuaueng/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/wuaueng/Makefile.in b/dlls/wuaueng/Makefile.in index 26be0bb..e4cd655 100644 --- a/dlls/wuaueng/Makefile.in +++ b/dlls/wuaueng/Makefile.in @@ -8,6 +8,8 @@ IMPORTS = kernel32 C_SRCS = \ main.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wuaueng/version.rc b/dlls/wuaueng/version.rc new file mode 100644 index 0000000..5931e86 --- /dev/null +++ b/dlls/wuaueng/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2009 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Update Agent" +#define WINE_FILENAME_STR "wuaueng.dll" +#define WINE_FILEVERSION 7,2,6001,788 +#define WINE_FILEVERSION_STR "7.2.6001.788" +#define WINE_PRODUCTVERSION 7,2,6001,788 +#define WINE_PRODUCTVERSION_STR "7.2.6001.788" + +#include "wine/wine_common_ver.rc"

1 0

Louis Lenders : wuaueng: Add stubbed wuaueng.dll.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 616136799e6322c83d1549751782cfe8b1efab42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=616136799e6322c83d1549751… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Oct 26 12:49:41 2009 +0100 wuaueng: Add stubbed wuaueng.dll. --- configure | 9 ++++++++ configure.ac | 1 + dlls/wuaueng/Makefile.in | 13 ++++++++++++ dlls/wuaueng/main.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wuaueng/wuaueng.spec | 16 +++++++++++++++ 5 files changed, 87 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 906bc67..937d1ae 100755 --- a/configure +++ b/configure @@ -17375,6 +17375,14 @@ dlls/wuapi/Makefile: dlls/wuapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/wuapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/wuaueng/Makefile" +test "x$enable_wuaueng" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wuaueng" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/wuaueng/Makefile: dlls/wuaueng/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/wuaueng/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/xinput1_1/Makefile" test "x$enable_xinput1_1" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ xinput1_1" @@ -19198,6 +19206,7 @@ do "dlls/wsock32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wsock32/Makefile" ;; "dlls/wtsapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wtsapi32/Makefile" ;; "dlls/wuapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wuapi/Makefile" ;; + "dlls/wuaueng/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wuaueng/Makefile" ;; "dlls/xinput1_1/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_1/Makefile" ;; "dlls/xinput1_2/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_2/Makefile" ;; "dlls/xinput1_3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/Makefile" ;; diff --git a/configure.ac b/configure.ac index 68f0f27..a6daf78 100644 --- a/configure.ac +++ b/configure.ac @@ -2558,6 +2558,7 @@ WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ WINE_CONFIG_MAKEFILE([dlls/wsock32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wuapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/wuaueng/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_1/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_2/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/wuaueng/Makefile.in b/dlls/wuaueng/Makefile.in new file mode 100644 index 0000000..26be0bb --- /dev/null +++ b/dlls/wuaueng/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = wuaueng.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wuaueng/main.c b/dlls/wuaueng/main.c new file mode 100644 index 0000000..487c302 --- /dev/null +++ b/dlls/wuaueng/main.c @@ -0,0 +1,48 @@ +/* + * Copyright 2009 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuaueng); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/wuaueng/wuaueng.spec b/dlls/wuaueng/wuaueng.spec new file mode 100644 index 0000000..9046a42 --- /dev/null +++ b/dlls/wuaueng/wuaueng.spec @@ -0,0 +1,16 @@ +1 stub GetAUOptionsEx +2 stub DSRunStoreAsComServer +3 stub UHRunRemoteHandlerServer +4 stub WUCheckForUpdatesAtShutdown +5 stub WUAutoUpdateAtShutdown + +@ stub GeneralizeForImaging +@ stub GetEngineStatusInfo +@ stub RegisterServiceVersion +@ stub ServiceHandler +@ stub ServiceMain +@ stub WUServiceMain +@ stub DllInstall +@ stub DllMain +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Jörg Höhle : winmm: Time formats hms/ tmsf use leading zeroes as in 00:00:00.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 91344ae77ca9cf6869efc1293c7e8d777da82238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91344ae77ca9cf6869efc1293… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 18 17:40:41 2009 +0200 winmm: Time formats hms/tmsf use leading zeroes as in 00:00:00. --- dlls/winmm/mci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 72f590e..e28a298 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1155,8 +1155,8 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret { static const WCHAR wszLd [] = {'%','l','d',0}; static const WCHAR wszLd4 [] = {'%','l','d',' ','%','l','d',' ','%','l','d',' ','%','l','d',0}; - static const WCHAR wszCol3[] = {'%','d',':','%','d',':','%','d',0}; - static const WCHAR wszCol4[] = {'%','d',':','%','d',':','%','d',':','%','d',0}; + static const WCHAR wszCol3[] = {'%','0','2','d',':','%','0','2','d',':','%','0','2','d',0}; + static const WCHAR wszCol4[] = {'%','0','2','d',':','%','0','2','d',':','%','0','2','d',':','%','0','2','d',0}; if (lpstrRet) { switch (retType) {

1 0

Jörg Höhle : mciwave: Send notification after everything else.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 7d002f228c410d4855803e0891006641ca955891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d002f228c410d4855803e089… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 17 16:41:10 2009 +0200 mciwave: Send notification after everything else. --- dlls/mciwave/mciwave.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index de78287..5270f25 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -884,14 +884,14 @@ cleanUp: } CloseHandle(wmw->hEvent); + wmw->dwStatus = MCI_MODE_STOP; + if (lpParms && (dwFlags & MCI_NOTIFY)) { mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wmw->openParms.wDeviceID, dwRet ? MCI_NOTIFY_FAILURE : MCI_NOTIFY_SUCCESSFUL); } - wmw->dwStatus = MCI_MODE_STOP; - return dwRet; } @@ -1108,14 +1108,14 @@ cleanUp: } CloseHandle(wmw->hEvent); + wmw->dwStatus = MCI_MODE_STOP; + if (lpParms && (dwFlags & MCI_NOTIFY)) { mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wmw->openParms.wDeviceID, dwRet ? MCI_NOTIFY_FAILURE : MCI_NOTIFY_SUCCESSFUL); } - wmw->dwStatus = MCI_MODE_STOP; - return dwRet; }

1 0

Jörg Höhle : mciwave: Do not transition via Resume from Record into Play.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 3fc7da7f5e946016a382191d1add46a912a7cc22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc7da7f5e946016a382191d1… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 17 16:40:28 2009 +0200 mciwave: Do not transition via Resume from Record into Play. --- dlls/mciwave/mciwave.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 664cc44..de78287 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -726,18 +726,18 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - wmw->fInput = FALSE; - if (wmw->hFile == 0) { WARN("Can't play: no file=%s!\n", debugstr_w(wmw->openParms.lpstrElementName)); return MCIERR_FILE_NOT_FOUND; } - if (wmw->dwStatus == MCI_MODE_PAUSE) { + if (wmw->dwStatus == MCI_MODE_PAUSE && !wmw->fInput) { /* FIXME: parameters (start/end) in lpParams may not be used */ return WAVE_mciResume(wDevID, dwFlags, (LPMCI_GENERIC_PARMS)lpParms); } + wmw->fInput = FALSE; + /** This function will be called again by a thread when async is used. * We have to set MCI_MODE_PLAY before we do this so that the app can spin * on MCI_STATUS, so we have to allow it here if we're not going to start this thread. @@ -972,16 +972,16 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (wmw->dwStatus == MCI_MODE_PAUSE && wmw->fInput) { + /* FIXME: parameters (start/end) in lpParams may not be used */ + return WAVE_mciResume(wDevID, dwFlags, (LPMCI_GENERIC_PARMS)lpParms); + } + /* FIXME : since there is no way to determine in which mode the device is * open (recording/playback) automatically switch from a mode to another */ wmw->fInput = TRUE; - if (wmw->dwStatus == MCI_MODE_PAUSE) { - /* FIXME: parameters (start/end) in lpParams may not be used */ - return WAVE_mciResume(wDevID, dwFlags, (LPMCI_GENERIC_PARMS)lpParms); - } - /** This function will be called again by a thread when async is used. * We have to set MCI_MODE_PLAY before we do this so that the app can spin * on MCI_STATUS, so we have to allow it here if we're not going to start this thread.

1 0

Jörg Höhle : mciwave: Do not lie about state when winmm fails in Pause or Resume.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 3c6496d7b5ec76a722c9f2d7bf3d965d15461c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6496d7b5ec76a722c9f2d7b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 17 21:30:33 2009 +0200 mciwave: Do not lie about state when winmm fails in Pause or Resume. --- dlls/mciwave/mciwave.c | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index a0415bd..664cc44 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1134,20 +1134,28 @@ static DWORD WAVE_mciPause(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARM switch (wmw->dwStatus) { case MCI_MODE_PLAY: - wmw->dwStatus = MCI_MODE_PAUSE; dwRet = waveOutPause(wmw->hWave); + if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_PAUSE; + else { /* When playthread was not started yet, winmm not opened, error 5 MMSYSERR_INVALHANDLE */ + ERR("waveOutPause error %d\n",dwRet); + dwRet = MCIERR_INTERNAL; + } break; case MCI_MODE_RECORD: - wmw->dwStatus = MCI_MODE_PAUSE; dwRet = waveInStop(wmw->hWave); + if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_PAUSE; + else { + ERR("waveInStop error %d\n",dwRet); + dwRet = MCIERR_INTERNAL; + } break; case MCI_MODE_PAUSE: dwRet = MMSYSERR_NOERROR; break; default: - return MCIERR_NONAPPLICABLE_FUNCTION; + dwRet = MCIERR_NONAPPLICABLE_FUNCTION; } - return (dwRet == MMSYSERR_NOERROR) ? 0 : MCIERR_INTERNAL; + return dwRet; } /************************************************************************** @@ -1164,12 +1172,21 @@ static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PAR switch (wmw->dwStatus) { case MCI_MODE_PAUSE: + /* Only update dwStatus if wave* succeeds and will exchange buffers buffers. */ if (wmw->fInput) { - wmw->dwStatus = MCI_MODE_RECORD; dwRet = waveInStart(wmw->hWave); + if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_RECORD; + else { + ERR("waveInStart error %d\n",dwRet); + dwRet = MCIERR_INTERNAL; + } } else { - wmw->dwStatus = MCI_MODE_PLAY; dwRet = waveOutRestart(wmw->hWave); + if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_PLAY; + else { + ERR("waveOutRestart error %d\n",dwRet); + dwRet = MCIERR_INTERNAL; + } } break; case MCI_MODE_PLAY: @@ -1177,9 +1194,9 @@ static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PAR dwRet = MMSYSERR_NOERROR; break; default: - return MCIERR_NONAPPLICABLE_FUNCTION; + dwRet = MCIERR_NONAPPLICABLE_FUNCTION; } - return (dwRet == MMSYSERR_NOERROR) ? 0 : MCIERR_INTERNAL; + return dwRet; } /**************************************************************************

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009