September 2010 - Wine-Commits

Jörg Höhle : winmm: Close MCI device after immediate auto-open commands.
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: e1fe9e4fed4f53a2999c8f5efba8125f2301ca8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1fe9e4fed4f53a2999c8f5ef… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Aug 25 07:32:28 2010 +0200 winmm: Close MCI device after immediate auto-open commands. --- dlls/winmm/mci.c | 48 ++++++++++++++++++++++++++++++++++-------------- dlls/winmm/tests/mci.c | 24 +++++++++++++----------- 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 2b47bd8..44a65a0 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1214,12 +1214,13 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, { LPWSTR verb, dev, args; LPWINE_MCIDRIVER wmd = 0; - MCIDEVICEID uDevID; + MCIDEVICEID uDevID, auto_open = 0; DWORD dwFlags = 0, dwRet = 0; int offset = 0; DWORD_PTR data[MCI_DATA_SIZE]; DWORD retType; LPCWSTR lpCmd = 0; + WORD wMsg = 0; static const WCHAR wszNew[] = {'n','e','w',0}; static const WCHAR wszSAliasS[] = {' ','a','l','i','a','s',' ',0}; static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; @@ -1229,6 +1230,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, TRACE("(%s, %p, %d, %p)\n", debugstr_w(lpstrCommand), lpstrRet, uRetLen, hwndCallback); + if (lpstrRet && uRetLen) *lpstrRet = '\0'; /* format is <command> <device> <optargs> */ if (!(verb = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpstrCommand)+1) * sizeof(WCHAR)))) @@ -1338,15 +1340,19 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev)))) { /* auto open */ static const WCHAR wszOpenWait[] = {'o','p','e','n',' ','%','s',' ','w','a','i','t',0}; - WCHAR buf[128]; - sprintfW(buf, wszOpenWait, dev); - - if ((dwRet = mciSendStringW(buf, NULL, 0, 0)) != 0) + WCHAR buf[138], retbuf[6]; + snprintfW(buf, sizeof(buf)/sizeof(WCHAR), wszOpenWait, dev); + /* open via mciSendString handles quoting, dev!file syntax and alias creation */ + if ((dwRet = mciSendStringW(buf, retbuf, sizeof(retbuf)/sizeof(WCHAR), 0)) != 0) goto errCleanUp; + auto_open = strtoulW(retbuf, NULL, 10); + TRACE("auto-opened %u\n", auto_open); - wmd = MCI_GetDriver(mciGetDeviceIDW(dev)); + /* FIXME: test for notify flag (how to preparse?) before opening */ + /* FIXME: Accept only core commands yet parse them with the specific table */ + wmd = MCI_GetDriver(auto_open); if (!wmd) { - /* FIXME: memory leak, MCI driver is not closed */ + ERR("No auto-open device %d for %s\n", auto_open, debugstr_w(dev)); dwRet = MCIERR_INVALID_DEVICE_ID; goto errCleanUp; } @@ -1372,6 +1378,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, dwRet = MCIERR_UNRECOGNIZED_COMMAND; goto errCleanUp; } + wMsg = MCI_GetMessage(lpCmd); /* set return information */ switch (retType = MCI_GetReturnType(lpCmd)) { @@ -1389,17 +1396,23 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, goto errCleanUp; /* set up call back */ + if (auto_open) { + if (dwFlags & MCI_NOTIFY) { + dwRet = MCIERR_NOTIFY_ON_AUTO_OPEN; + goto errCleanUp; + } + /* FIXME: the command should get its own notification window set up and + * ask for device closing while processing the notification mechanism. + * hwndCallback = ... + * dwFlags |= MCI_NOTIFY; + * In the meantime special-case all commands but PLAY and RECORD below. */ + } if (dwFlags & MCI_NOTIFY) { data[0] = (DWORD_PTR)hwndCallback; } - /* FIXME: the command should get it's own notification window set up and - * ask for device closing while processing the notification mechanism - */ - if (lpstrRet && uRetLen) *lpstrRet = '\0'; - TRACE("[%d, %s, %08x, %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx]\n", - wmd ? wmd->wDeviceID : uDevID, MCI_MessageToString(MCI_GetMessage(lpCmd)), dwFlags, + wmd ? wmd->wDeviceID : uDevID, MCI_MessageToString(wMsg), dwFlags, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7], data[8], data[9]); @@ -1408,13 +1421,20 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, MCI_UnLoadMciDriver(wmd); /* FIXME: notification is not properly shared across two opens */ } else { - dwRet = MCI_SendCommand(wmd ? wmd->wDeviceID : uDevID, MCI_GetMessage(lpCmd), dwFlags, (DWORD_PTR)data); + dwRet = MCI_SendCommand(wmd ? wmd->wDeviceID : uDevID, wMsg, dwFlags, (DWORD_PTR)data); } TRACE("=> 1/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); dwRet = MCI_HandleReturnValues(dwRet, wmd, retType, data, lpstrRet, uRetLen); TRACE("=> 2/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); errCleanUp: + if (auto_open) { + /* PLAY and RECORD are the only known non-immediate commands */ + if (LOWORD(dwRet) || !(wMsg == MCI_PLAY || wMsg == MCI_RECORD)) + MCI_SendCommand(auto_open, MCI_CLOSE, 0, 0); + else + FIXME("leaking auto-open device %u\n", auto_open); + } HeapFree(GetProcessHeap(), 0, verb); return dwRet; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 642e346..19082e8 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -851,16 +851,13 @@ static void test_AutoOpenWAVE(HWND hwnd) test_notification(hwnd, "sysinfo name outofrange\n", err ? 0 : MCI_NOTIFY_SUCCESSFUL); err = mciSendString("play no-such-file-exists.wav notify", buf, sizeof(buf), NULL); - if(err==MCIERR_FILE_NOT_FOUND) { /* a Wine detector */ - /* Unsupported auto-open leaves the file open, preventing clean-up */ - skip("Skipping auto-open tests in Wine\n"); - return; - } + todo_wine ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open notify returned %s\n", dbg_mcierr(err)); + /* FILE_NOT_FOUND in Wine because auto-open fails before testing the notify flag */ test_notification(hwnd, "-prior to auto-open-", 0); err = mciSendString("play tempfile.wav notify", buf, sizeof(buf), hwnd); - todo_wine ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); + ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); if(err) /* FIXME: don't open twice yet, it confuses Wine. */ err = mciSendString("play tempfile.wav", buf, sizeof(buf), hwnd); @@ -874,7 +871,7 @@ static void test_AutoOpenWAVE(HWND hwnd) buf[0]=0; err = mciSendString("sysinfo waveaudio quantity open", buf, sizeof(buf), NULL); ok(!err,"mci sysinfo waveaudio quantity after auto-open returned %s\n", dbg_mcierr(err)); - if(!err) todo_wine ok(!strcmp(buf,"1"), "sysinfo quantity open expected 1, got: %s\n", buf); + if(!err) ok(!strcmp(buf,"1"), "sysinfo quantity open expected 1, got: %s\n", buf); parm.sys.lpstrReturn = (LPSTR)&intbuf[1]; parm.sys.dwRetSize = 2*sizeof(DWORD); /* only one DWORD is used */ @@ -907,9 +904,10 @@ static void test_AutoOpenWAVE(HWND hwnd) ok(!err,"mci status tempfile.wav mode returned %s\n", dbg_mcierr(err)); if(!err) ok(!strcmp(buf,"playing"), "mci auto-open status mode, got: %s\n", buf); + if (0) { /* FIXME: wait until this no more confuses Wine */ err = mciSendString("open tempfile.wav", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_DEVICE_OPEN, "mci open from auto-open returned %s\n", dbg_mcierr(err)); - + } /* w2k/xp and Wine differ. While the device is busy playing, it is * regularly open and accessible via the filename: subsequent * commands must not cause auto-open each. In Wine, a subsequent @@ -927,11 +925,15 @@ static void test_AutoOpenWAVE(HWND hwnd) trace("Wine style MCI auto-close upon notification\n"); /* "playing" because auto-close comes after the status call. */ - todo_wine ok(!strcmp(buf,"playing"), "mci auto-open status mode notify, got: %s\n", buf); + ok(!strcmp(buf,"playing"), "mci auto-open status mode notify, got: %s\n", buf); /* fixme:winmm:MMDRV_Exit Closing while ll-driver open * is explained by failure to auto-close a device. */ test_notification(hwnd,"status notify",MCI_NOTIFY_SUCCESSFUL); /* MCI received NOTIFY_SUPERSEDED and auto-closed the device. */ + + /* Until this is implemented, force closing the device */ + err = mciSendString("close tempfile.wav", NULL, 0, hwnd); + ok(!err,"mci auto-still-open stop returned %s\n", dbg_mcierr(err)); Sleep(16); test_notification(hwnd,"auto-open",0); } else if(err==MCIERR_NOTIFY_ON_AUTO_OPEN) { /* MS style */ @@ -945,14 +947,14 @@ static void test_AutoOpenWAVE(HWND hwnd) if(!err) ok(!strcmp(buf,"paused"), "mci auto-open status mode, got: %s\n", buf); /* Auto-close */ - err = mciSendString("stop tempfile.wav", NULL, 0, hwnd); + err = mciSendString("stop tempfile.wav wait", NULL, 0, hwnd); ok(!err,"mci auto-still-open stop returned %s\n", dbg_mcierr(err)); Sleep(16); /* makes sysinfo quantity open below succeed */ } err = mciSendString("sysinfo waveaudio quantity open", buf, sizeof(buf), NULL); ok(!err,"mci sysinfo waveaudio quantity open after close returned %s\n", dbg_mcierr(err)); - if(!err) todo_wine ok(!strcmp(buf,"0"), "sysinfo quantity open expected 0 after auto-close, got: %s\n", buf); + if(!err) ok(!strcmp(buf,"0"), "sysinfo quantity open expected 0 after auto-close, got: %s\n", buf); /* w95-WinME (not w2k/XP) switch to C:\ after auto-playing once. Prevent * MCIERR_FILE_NOT_FOUND by using the full path name from the Info file command.

1 0

Jörg Höhle : winmm/tests: Add MCI parser tests.
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: d223b30bd6be4cf45a507bd51114fa87ca0cf7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d223b30bd6be4cf45a507bd51… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jul 6 07:31:55 2010 +0200 winmm/tests: Add MCI parser tests. --- dlls/winmm/tests/mci.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 2918dc7..d490a04 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -186,6 +186,91 @@ static void test_mciParser(HWND hwnd) test_notification(hwnd, "MCI_OPEN", MCI_NOTIFY_SUCCESSFUL); test_notification(hwnd, "MCI_OPEN no #2", 0); + err = mciSendString("open avivideo alias a", buf, sizeof(buf), hwnd); + ok(!err,"open another: %s\n", dbg_mcierr(err)); + + err = mciSendString("", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_MISSING_COMMAND_STRING,"empty string: %s\n", dbg_mcierr(err)); + + err = mciSendString("open", buf, sizeof(buf), NULL); + ok(err==MCIERR_MISSING_DEVICE_NAME,"open void: %s\n", dbg_mcierr(err)); + + err = mciSendString("open notify", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_INVALID_DEVICE_NAME,"open notify: %s\n", dbg_mcierr(err)); + + err = mciSendString("open new", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_NEW_REQUIRES_ALIAS,"open new: %s\n", dbg_mcierr(err)); + + err = mciSendString("open new type waveaudio alias r shareable shareable", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_DUPLICATE_FLAGS,"open new: %s\n", dbg_mcierr(err)); + if(!err) mciSendString("close r", NULL, 0, NULL); + + err = mciSendString("status x position wait wait", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_DUPLICATE_FLAGS,"status wait wait: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x length length", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_FLAGS_NOT_COMPATIBLE,"status 2xlength: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x length position", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_FLAGS_NOT_COMPATIBLE,"status length+position: %s\n", dbg_mcierr(err)); + + err = mciSendString("set x time format milliseconds time format ms", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_FLAGS_NOT_COMPATIBLE,"status length+position: %s\n", dbg_mcierr(err)); + + /* device's response, not a parser test */ + err = mciSendString("status x", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_MISSING_PARAMETER,"status waveaudio nokeyword: %s\n", dbg_mcierr(err)); + + err = mciSendString("status a", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_UNSUPPORTED_FUNCTION,"status avivideo nokeyword: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x track", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_BAD_INTEGER,"status waveaudio no track: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x track 3", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_MISSING_PARAMETER,"status waveaudio track 3: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x 2 track 3", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_OUTOFRANGE,"status 2(position) track 3: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x 4", buf, sizeof(buf), hwnd); + ok(!err,"status 4(mode): %s\n", dbg_mcierr(err)); + if(!err)ok(!strcmp(buf,"stopped"), "status 4(mode), got: %s\n", buf); + + err = mciSendString("status x 4 notify", buf, sizeof(buf), hwnd); + todo_wine ok(!err,"status 4(mode) notify: %s\n", dbg_mcierr(err)); + if(!err)ok(!strcmp(buf,"stopped"), "status 4(mode), got: %s\n", buf); + test_notification(hwnd, "status 4 notify", err ? 0 : MCI_NOTIFY_SUCCESSFUL); + + err = mciSendString("set x milliseconds", buf, sizeof(buf), hwnd); + todo_wine ok(err==MCIERR_UNRECOGNIZED_KEYWORD,"set milliseconds: %s\n", dbg_mcierr(err)); + + err = mciSendString("set x milliseconds ms", buf, sizeof(buf), hwnd); + todo_wine ok(err==MCIERR_UNRECOGNIZED_KEYWORD,"set milliseconds ms: %s\n", dbg_mcierr(err)); + + err = mciSendString("capability x can save", buf, sizeof(buf), hwnd); + todo_wine ok(!err,"capability can (space) save: %s\n", dbg_mcierr(err)); + + err = mciSendString("status x nsa", buf, sizeof(buf), hwnd); + todo_wine ok(err==MCIERR_BAD_CONSTANT,"status nsa: %s\n", dbg_mcierr(err)); + + err = mciSendString("status all time format", buf, sizeof(buf), hwnd); + ok(err==MCIERR_CANNOT_USE_ALL,"status all: %s\n", dbg_mcierr(err)); + + err = mciSendString("cue all", buf, sizeof(buf), NULL); + ok(err==MCIERR_UNRECOGNIZED_COMMAND,"cue all: %s\n", dbg_mcierr(err)); + + err = mciSendString("open all", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_CANNOT_USE_ALL,"open all: %s\n", dbg_mcierr(err)); + + err = mciSendString("put a window at 0 0", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_BAD_INTEGER,"put incomplete rect: %s\n", dbg_mcierr(err)); + + /*w9X-w2k report code from device last opened, newer versions compare them all + * and return the one error code or MCIERR_MULTIPLE if they differ. */ + err = mciSendString("pause all", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_MULTIPLE || broken(err==MCIERR_NONAPPLICABLE_FUNCTION),"pause all: %s\n", dbg_mcierr(err)); + /* MCI_STATUS' dwReturn is a DWORD_PTR, others' a plain DWORD. */ parm.status.dwItem = MCI_STATUS_TIME_FORMAT; parm.status.dwReturn = 0xFEEDABAD; @@ -236,6 +321,9 @@ static void test_mciParser(HWND hwnd) err = mciSendCommand(wDeviceID, MCI_CLOSE, 0, 0); ok(!err,"mciCommand close returned %s\n", dbg_mcierr(err)); + err = mciSendString("close a", buf, sizeof(buf), hwnd); + ok(!err,"close avi: %s\n", dbg_mcierr(err)); + test_notification(hwnd, "-end of 1st set-", 0); }

1 0

Jörg Höhle : winmm: MCI open always creates an alias for subsequent commands.
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: ef372e259a6663e9e2ef19b5d984110aa713560b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef372e259a6663e9e2ef19b5d… Author: Jörg Höhle <Joerg-Cyril.Hoehle(a)t-systems.com> Date: Wed Sep 1 17:50:43 2010 +0200 winmm: MCI open always creates an alias for subsequent commands. --- dlls/winmm/mci.c | 31 +++++++++++++++++-------------- dlls/winmm/tests/mci.c | 2 +- dlls/winmm/winemm.h | 1 - 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index d604c98..2b47bd8 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -123,7 +123,7 @@ static UINT MCI_GetDriverFromString(LPCWSTR lpstrName) EnterCriticalSection(&WINMM_cs); for (wmd = MciDrivers; wmd; wmd = wmd->lpNext) { - if (wmd->lpstrElementName && strcmpW(wmd->lpstrElementName, lpstrName) == 0) { + if (wmd->lpstrAlias && strcmpiW(wmd->lpstrAlias, lpstrName) == 0) { ret = wmd->wDeviceID; break; } @@ -131,10 +131,6 @@ static UINT MCI_GetDriverFromString(LPCWSTR lpstrName) ret = wmd->wDeviceID; break; } - if (wmd->lpstrAlias && strcmpiW(wmd->lpstrAlias, lpstrName) == 0) { - ret = wmd->wDeviceID; - break; - } } LeaveCriticalSection(&WINMM_cs); @@ -770,7 +766,6 @@ static BOOL MCI_UnLoadMciDriver(LPWINE_MCIDRIVER wmd) HeapFree(GetProcessHeap(), 0, wmd->lpstrDeviceType); HeapFree(GetProcessHeap(), 0, wmd->lpstrAlias); - HeapFree(GetProcessHeap(), 0, wmd->lpstrElementName); HeapFree(GetProcessHeap(), 0, wmd); return TRUE; @@ -888,15 +883,23 @@ static DWORD MCI_SendCommandFrom32(MCIDEVICEID wDevID, UINT16 wMsg, DWORD_PTR dw static DWORD MCI_FinishOpen(LPWINE_MCIDRIVER wmd, LPMCI_OPEN_PARMSW lpParms, DWORD dwParam) { - if (dwParam & MCI_OPEN_ELEMENT) - { - wmd->lpstrElementName = HeapAlloc(GetProcessHeap(),0,(strlenW(lpParms->lpstrElementName)+1) * sizeof(WCHAR)); - strcpyW( wmd->lpstrElementName, lpParms->lpstrElementName ); + LPCWSTR alias = NULL; + /* Open always defines an alias for further reference */ + if (dwParam & MCI_OPEN_ALIAS) /* open ... alias */ + alias = lpParms->lpstrAlias; + else { + if ((dwParam & MCI_OPEN_ELEMENT) /* open file.wav */ + && !(dwParam & MCI_OPEN_ELEMENT_ID)) + alias = lpParms->lpstrElementName; + else if (dwParam & MCI_OPEN_TYPE ) /* open cdaudio */ + alias = wmd->lpstrDeviceType; } - if (dwParam & MCI_OPEN_ALIAS) - { - wmd->lpstrAlias = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpParms->lpstrAlias)+1) * sizeof(WCHAR)); - strcpyW( wmd->lpstrAlias, lpParms->lpstrAlias); + if (alias) { + wmd->lpstrAlias = HeapAlloc(GetProcessHeap(), 0, (strlenW(alias)+1) * sizeof(WCHAR)); + if (!wmd->lpstrAlias) return MCIERR_OUT_OF_MEMORY; + strcpyW( wmd->lpstrAlias, alias); + /* In most cases, natives adds MCI_OPEN_ALIAS to the flags passed to the driver. + * Don't. The drivers don't care about the winmm alias. */ } lpParms->wDeviceID = wmd->wDeviceID; diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 66633bc..642e346 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -644,7 +644,7 @@ static void test_asyncWAVE(HWND hwnd) /* Only the alias is looked up. */ err = mciGetDeviceID("tempfile.wav"); - todo_wine ok(err==0,"mciGetDeviceID element returned %u, expected 0\n", err); + ok(err==0,"mciGetDeviceID element returned %u, expected 0\n", err); err = mciGetDeviceID("waveaudio"); todo_wine ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 75dc1e4..6d170de 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -95,7 +95,6 @@ typedef struct { typedef struct tagWINE_MCIDRIVER { UINT wDeviceID; UINT wType; - LPWSTR lpstrElementName; LPWSTR lpstrDeviceType; LPWSTR lpstrAlias; HDRVR hDriver;

1 0

Hans Leidekker : msi: Set the MsiAMD64 and Msix64 properties on 64-bit.
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: 3730300a298fa05ab04248e41a21ff579517bc09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3730300a298fa05ab04248e41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 2 13:20:54 2010 +0200 msi: Set the MsiAMD64 and Msix64 properties on 64-bit. --- dlls/msi/package.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 323968c..bb04ab0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -684,6 +684,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; static const WCHAR szIntFormat[] = {'%','d',0}; static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; + static const WCHAR szMsiAMD64[] = { 'M','s','i','A','M','D','6','4',0 }; + static const WCHAR szMsix64[] = { 'M','s','i','x','6','4',0 }; static const WCHAR szUserInfo[] = { 'S','O','F','T','W','A','R','E','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -845,6 +847,12 @@ static VOID set_installer_properties(MSIPACKAGE *package) sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel ); msi_set_property( package->db, szIntel, bufstr ); } + else if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + { + sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel ); + msi_set_property( package->db, szMsiAMD64, bufstr ); + msi_set_property( package->db, szMsix64, bufstr ); + } /* Screen properties. */ dc = GetDC(0);

1 0

Matteo Bruni : d3dx9: Implement D3DXCompileShaderFromResource.
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: 5a5af75f04e2df1813936af24a84dd6a2da20a49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a5af75f04e2df1813936af24… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Sep 1 23:15:44 2010 +0200 d3dx9: Implement D3DXCompileShaderFromResource. --- dlls/d3dx9_36/shader.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index d6e3ecc..1ddcde7 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -458,6 +458,52 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename, return hr; } +HRESULT WINAPI D3DXCompileShaderFromResourceA(HMODULE module, + LPCSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR entrypoint, + LPCSTR profile, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages, + LPD3DXCONSTANTTABLE* constant_table) +{ + HRSRC res; + LPCSTR buffer; + DWORD len; + + if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) + return D3DXERR_INVALIDDATA; + if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + return D3DXERR_INVALIDDATA; + return D3DXCompileShader(buffer, len, defines, include, entrypoint, profile, + flags, shader, error_messages, constant_table); +} + +HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, + LPCWSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR entrypoint, + LPCSTR profile, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages, + LPD3DXCONSTANTTABLE* constant_table) +{ + HRSRC res; + LPCSTR buffer; + DWORD len; + + if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) + return D3DXERR_INVALIDDATA; + if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + return D3DXERR_INVALIDDATA; + return D3DXCompileShader(buffer, len, defines, include, entrypoint, profile, + flags, shader, error_messages, constant_table); +} + static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl; typedef struct ID3DXConstantTableImpl {

1 0

Hans Leidekker : msi/tests: Add tests for 64-bit properties.
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: 2fb648c04f706f7318ca27a66885b47b527b5c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb648c04f706f7318ca27a66… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 2 13:21:29 2010 +0200 msi/tests: Add tests for 64-bit properties. --- dlls/msi/tests/package.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f9d6a63..225a0e3 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -41,6 +41,7 @@ static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI *pRegDeleteKeyExW)(HKEY, LPCWSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static void (WINAPI *pGetSystemInfo)(LPSYSTEM_INFO); static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); static BOOL (WINAPI *pSRSetRestorePointA)(RESTOREPOINTINFOA*, STATEMGRSTATUS*); @@ -63,6 +64,7 @@ static void init_functionpointers(void) GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hadvapi32, RegDeleteKeyExW) GET_PROC(hkernel32, IsWow64Process) + GET_PROC(hkernel32, GetSystemInfo) hsrclient = LoadLibraryA("srclient.dll"); GET_PROC(hsrclient, SRRemoveRestorePoint); @@ -9550,6 +9552,7 @@ static void test_installprops(void) UINT r; REGSAM access = KEY_ALL_ACCESS; BOOL wow64; + SYSTEM_INFO si; if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64) access |= KEY_WOW64_64KEY; @@ -9660,6 +9663,31 @@ static void test_installprops(void) r = MsiGetProperty(hpkg, "ScreenY", buf, &size); ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); + if (pGetSystemInfo) + { + pGetSystemInfo(&si); + if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + { + buf[0] = 0; + size = MAX_PATH; + r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size); + ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok(buf[0], "property not set\n"); + + buf[0] = 0; + size = MAX_PATH; + r = MsiGetProperty(hpkg, "Msix64", buf, &size); + ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok(buf[0], "property not set\n"); + + buf[0] = 0; + size = MAX_PATH; + r = MsiGetProperty(hpkg, "System64Folder", buf, &size); + ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok(buf[0], "property not set\n"); + } + } + CloseHandle(hkey1); CloseHandle(hkey2); MsiCloseHandle(hpkg);

1 0

Hans Leidekker : msi: Set the System64Folder property on 64-bit.
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: d2f107472537bad5a9f9fd45d53e396c49991d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f107472537bad5a9f9fd45d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 2 13:21:12 2010 +0200 msi: Set the System64Folder property on 64-bit. --- dlls/msi/package.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bb04ab0..aa0d1b5 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -686,6 +686,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; static const WCHAR szMsiAMD64[] = { 'M','s','i','A','M','D','6','4',0 }; static const WCHAR szMsix64[] = { 'M','s','i','x','6','4',0 }; + static const WCHAR szSystem64Folder[] = { 'S','y','s','t','e','m','6','4','F','o','l','d','e','r',0 }; static const WCHAR szUserInfo[] = { 'S','O','F','T','W','A','R','E','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -852,6 +853,9 @@ static VOID set_installer_properties(MSIPACKAGE *package) sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel ); msi_set_property( package->db, szMsiAMD64, bufstr ); msi_set_property( package->db, szMsix64, bufstr ); + + GetSystemDirectoryW( pth, MAX_PATH ); + msi_set_property( package->db, szSystem64Folder, pth ); } /* Screen properties. */

1 0

Louis Lenders : shell32: Add stubbed SHGetKnownFolderPath.
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: dd1a47093e7577a705d64355ac01136edd90f255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1a47093e7577a705d64355a… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Sep 2 13:10:44 2010 +0200 shell32: Add stubbed SHGetKnownFolderPath. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellpath.c | 10 ++++++++++ include/shlobj.h | 1 + include/shtypes.idl | 12 ++++++++++++ 4 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 99f9879..719fc9a 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -366,6 +366,7 @@ @ stdcall SHGetInstanceExplorer(long) @ stdcall SHGetItemFromDataObject(ptr long ptr ptr) @ stdcall SHGetItemFromObject(ptr ptr ptr) +@ stdcall SHGetKnownFolderPath(ptr long ptr ptr) @ stdcall SHGetLocalizedName(wstr ptr long ptr) @ stdcall SHGetMalloc(ptr) @ stdcall SHGetNameFromIDList(ptr long ptr) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 451d6ff..6083b45 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -40,6 +40,7 @@ #include "winuser.h" #include "shlobj.h" +#include "shtypes.h" #include "shresdef.h" #include "shell32_main.h" #include "undocshell.h" @@ -2502,3 +2503,12 @@ HRESULT WINAPI SHGetSpecialFolderLocation( hr = SHGetFolderLocation(hwndOwner, nFolder, NULL, 0, ppidl); return hr; } + +/************************************************************************* + * SHGetKnownFolderPath [SHELL32.@] + */ +HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, PWSTR *path) +{ + FIXME("(%s, %d, %p, %p) stub!\n", debugstr_guid(rfid), flags, token, path); + return E_NOTIMPL; +} diff --git a/include/shlobj.h b/include/shlobj.h index 0aef3cf..cda1306 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -62,6 +62,7 @@ HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); #define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir); +HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); #define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList) diff --git a/include/shtypes.idl b/include/shtypes.idl index dd0c5f6..091e509 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -111,3 +111,15 @@ typedef [v1_enum] enum tagSHCOLSTATE } SHCOLSTATE; typedef DWORD SHCOLSTATEF; + +typedef GUID KNOWNFOLDERID; + +cpp_quote("#if 0") +typedef KNOWNFOLDERID *REFKNOWNFOLDERID; +cpp_quote("#endif") + +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define REFKNOWNFOLDERID const KNOWNFOLDERID &") +cpp_quote("#else") +cpp_quote("#define REFKNOWNFOLDERID const KNOWNFOLDERID * __MIDL_CONST") +cpp_quote("#endif")

1 0

Hans Leidekker : msi: Return an error from MsiDatabaseGetPrimaryKeys if the table does not exist .
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: 18ebf2c57610e3474876e908bccc5b61ee8d73e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ebf2c57610e3474876e908b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 2 13:20:36 2010 +0200 msi: Return an error from MsiDatabaseGetPrimaryKeys if the table does not exist. --- dlls/msi/msiquery.c | 3 +++ dlls/msi/tests/record.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index df81a74..c603e6a 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -901,6 +901,9 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db, MSIQUERY *query = NULL; UINT r; + if (!TABLE_Exists( db, table )) + return ERROR_INVALID_TABLE; + r = MSI_OpenQuery( db, &query, sql, table ); if( r != ERROR_SUCCESS ) return r; diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 0b80779..2de43cb 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -589,6 +589,9 @@ static void test_fieldzero(void) MsiCloseHandle(rec); + r = MsiDatabaseGetPrimaryKeysA(hdb, "nosuchtable", &rec); + ok(r == ERROR_INVALID_TABLE, "Expected ERROR_INVALID_TABLE, got %d\n", r); + query = "SELECT * FROM `drone` WHERE `id` = 1"; r = MsiDatabaseOpenView(hdb, query, &hview); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Matteo Bruni : d3dx9: Implement D3DXCompileShaderFromFile.
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: de8f35bba87d0dc53e57f197f0ea28b90b5a3ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8f35bba87d0dc53e57f197f… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Sep 1 22:53:13 2010 +0200 d3dx9: Implement D3DXCompileShaderFromFile. --- dlls/d3dx9_36/shader.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 35665d6..d6e3ecc 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -383,6 +383,81 @@ HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData, return hr; } +HRESULT WINAPI D3DXCompileShaderFromFileA(LPCSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR entrypoint, + LPCSTR profile, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages, + LPD3DXCONSTANTTABLE* constant_table) +{ + LPWSTR filename_w = NULL; + DWORD len; + HRESULT ret; + + if (!filename) return D3DXERR_INVALIDDATA; + + len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); + filename_w = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!filename_w) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filename_w, len); + + ret = D3DXCompileShaderFromFileW(filename_w, defines, include, + entrypoint, profile, flags, + shader, error_messages, constant_table); + + HeapFree(GetProcessHeap(), 0, filename_w); + return ret; +} + +HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR entrypoint, + LPCSTR profile, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages, + LPD3DXCONSTANTTABLE* constant_table) +{ + void *buffer; + DWORD len; + HRESULT hr; + struct D3DXIncludeImpl includefromfile; + char *filename_a; + + if (FAILED(map_view_of_file(filename, &buffer, &len))) + return D3DXERR_INVALIDDATA; + + if (!include) + { + includefromfile.lpVtbl = &D3DXInclude_Vtbl; + include = (LPD3DXINCLUDE)&includefromfile; + } + + filename_a = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + if (!filename_a) + { + UnmapViewOfFile(buffer); + return E_OUTOFMEMORY; + } + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + + hr = D3DCompile(buffer, len, filename_a, (D3D_SHADER_MACRO *)defines, + (ID3DInclude *)include, entrypoint, profile, flags, 0, + (ID3DBlob **)shader, (ID3DBlob **)error_messages); + + if (SUCCEEDED(hr) && constant_table) + hr = D3DXGetShaderConstantTable(ID3DXBuffer_GetBufferPointer(*shader), + constant_table); + + HeapFree(GetProcessHeap(), 0, filename_a); + UnmapViewOfFile(buffer); + return hr; +} + static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl; typedef struct ID3DXConstantTableImpl {

1 0