wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Jörg Höhle : winmm: MCI_INFO doesn' t change the output buffer in case of error.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 22055590f612994c1dceef1911cfd972747f218a URL: http://source.winehq.org/git/wine.git/?a=commit;h=22055590f612994c1dceef191… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Oct 5 21:09:11 2010 +0200 winmm: MCI_INFO doesn't change the output buffer in case of error. --- dlls/mciavi32/info.c | 13 ++++--------- dlls/mcicda/mcicda.c | 19 ++++++++----------- dlls/mciseq/mcimidi.c | 16 +++++++--------- dlls/mciwave/mciwave.c | 21 ++++++++++----------- dlls/winmm/tests/mci.c | 14 ++++++++++++++ 5 files changed, 43 insertions(+), 40 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index b2ec030..668464c 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -211,16 +211,11 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) WARN("Don't know this info command (%u)\n", dwFlags); ret = MCIERR_UNRECOGNIZED_COMMAND; } - if (str) { - if (strlenW(str) + 1 > lpParms->dwRetSize) { - ret = MCIERR_PARAM_OVERFLOW; - } else { - lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize); - } - } else { - lpParms->lpstrReturn[0] = 0; + if (!ret) { + WCHAR zero = 0; + /* Only mciwave, mciseq and mcicda set dwRetSize (since NT). */ + lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); } - LeaveCriticalSection(&wma->cs); return ret; } diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 4c67085..3ec8307 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -650,18 +650,15 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) WARN("Don't know this info command (%u)\n", dwFlags); ret = MCIERR_MISSING_PARAMETER; } - if (str) { - if (lpParms->dwRetSize <= strlenW(str)) { - lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize - 1); - ret = MCIERR_PARAM_OVERFLOW; - } else { - strcpyW(lpParms->lpstrReturn, str); - } - } else { - *lpParms->lpstrReturn = 0; + if (!ret) { + TRACE("=> %s\n", debugstr_w(str)); + if (lpParms->dwRetSize) { + WCHAR zero = 0; + /* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize + * to the number of characters written, excluding \0. */ + lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + } else ret = MCIERR_PARAM_OVERFLOW; } - TRACE("=> %s (%d)\n", debugstr_w(lpParms->lpstrReturn), ret); - if (MMSYSERR_NOERROR==ret && (dwFlags & MCI_NOTIFY)) MCICDA_Notify(lpParms->dwCallback, wmcda, MCI_NOTIFY_SUCCESSFUL); return ret; diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index ec9a24a..5d15874 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1600,15 +1600,13 @@ static DWORD MIDI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) WARN("Don't know this info command (%u)\n", dwFlags); return MCIERR_UNRECOGNIZED_COMMAND; } - if (str) { - if (lpParms->dwRetSize <= strlenW(str)) { - lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize - 1); - ret = MCIERR_PARAM_OVERFLOW; - } else { - strcpyW(lpParms->lpstrReturn, str); - } - } else { - *lpParms->lpstrReturn = 0; + if (!ret) { + if (lpParms->dwRetSize) { + WCHAR zero = 0; + /* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize + * to the number of characters written, excluding \0. */ + lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + } else ret = MCIERR_PARAM_OVERFLOW; } return ret; } diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index b2dc1a1..edd63ce 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1665,6 +1665,8 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l if (!lpParms || !lpParms->lpstrReturn) return MCIERR_NULL_PARAMETER_BLOCK; + TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); + if (wmw == NULL) { ret = MCIERR_INVALID_DEVICE_ID; } else { @@ -1672,8 +1674,6 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l static const WCHAR wszWaveIn [] = {'W','i','n','e',' ','W','a','v','e',' ','I','n',0}; static const WCHAR wszWaveOut[] = {'W','i','n','e',' ','W','a','v','e',' ','O','u','t',0}; - TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); - switch (dwFlags & ~(MCI_WAIT|MCI_NOTIFY)) { case MCI_INFO_PRODUCT: str = wszAudio; break; case MCI_INFO_FILE: str = wmw->lpFileName; break; @@ -1681,17 +1681,16 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l case MCI_WAVE_OUTPUT: str = wszWaveOut; break; default: WARN("Don't know this info command (%u)\n", dwFlags); - ret = MCIERR_UNRECOGNIZED_COMMAND; + ret = MCIERR_UNRECOGNIZED_KEYWORD; } } - if (str) { - if (strlenW(str) + 1 > lpParms->dwRetSize) { - ret = MCIERR_PARAM_OVERFLOW; - } else { - lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize); - } - } else { - lpParms->lpstrReturn[0] = 0; + if (!ret) { + if (lpParms->dwRetSize) { + WCHAR zero = 0; + /* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize + * to the number of characters written, excluding \0. */ + lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + } else ret = MCIERR_PARAM_OVERFLOW; } if (MMSYSERR_NOERROR==ret && (dwFlags & MCI_NOTIFY)) WAVE_mciNotify(lpParms->dwCallback, wmw, MCI_NOTIFY_SUCCESSFUL); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 1672433..4f89b82 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -30,6 +30,7 @@ static MCIERROR ok_saved = MCIERR_FILE_NOT_FOUND; typedef union { + MCI_INFO_PARMS info; MCI_STATUS_PARMS status; MCI_WAVE_SET_PARMS set; MCI_WAVE_OPEN_PARMS open; @@ -486,6 +487,19 @@ static void test_openCloseWAVE(HWND hwnd) ok(err==MCIERR_INVALID_DEVICE_NAME || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommand MCI_SYSINFO nodev installname: %s\n", dbg_mcierr(err)); ok(!strcmp(buf,"K"), "output buffer %s\n", buf); + buf[1] = 'L'; + parm.info.lpstrReturn = buf; + parm.info.dwRetSize = 2; + err = mciSendCommand(1, MCI_INFO, MCI_INFO_PRODUCT, (DWORD_PTR)&parm); + ok(!err, "mciCommand MCI_INFO product: %s\n", dbg_mcierr(err)); + ok(buf[0] && !buf[1], "info product output buffer %s\n", buf); + + buf[0] = 'K'; + parm.info.dwRetSize = sizeof(buf); + err = mciSendCommandW(1, MCI_INFO, 0x07000000, (DWORD_PTR)&parm); + ok(err==MCIERR_UNRECOGNIZED_KEYWORD, "mciCommand MCI_INFO other: %s\n", dbg_mcierr(err)); + ok(!strcmp(buf,"K"), "info output buffer %s\n", buf); + err = mciGetDeviceID("all"); ok(MCI_ALL_DEVICE_ID==err || /* Win9x */(WORD)MCI_ALL_DEVICE_ID==err,"mciGetDeviceID all returned %u, expected %d\n", err, MCI_ALL_DEVICE_ID);

1 0

Jörg Höhle : winmm: MCI_SYSINFO doesn' t change the output buffer in case of error.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: a9f9b34e17149f110d048e9f9cb7cbc9fc79bf81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f9b34e17149f110d048e9f9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 22 21:17:32 2010 +0200 winmm: MCI_SYSINFO doesn't change the output buffer in case of error. --- dlls/winmm/mci.c | 2 -- dlls/winmm/tests/mci.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 455a733..3558d2b 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1843,7 +1843,6 @@ static DWORD MCI_WriteString(LPWSTR lpDstStr, DWORD dstSize, LPCWSTR lpSrcStr) if (lpSrcStr) { if (dstSize <= strlenW(lpSrcStr)) { - lstrcpynW(lpDstStr, lpSrcStr, dstSize - 1); ret = MCIERR_PARAM_OVERFLOW; } else { strcpyW(lpDstStr, lpSrcStr); @@ -1931,7 +1930,6 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm ret = MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, wmd->lpstrDeviceType); } else { - *lpParms->lpstrReturn = 0; ret = (uDevID == MCI_ALL_DEVICE_ID) ? MCIERR_CANNOT_USE_ALL : MCIERR_INVALID_DEVICE_NAME; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index ebd393f..1672433 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -162,6 +162,13 @@ static void test_notification_dbg(HWND hwnd, const char* command, WPARAM type, i else ok_(__FILE__,line)(msg.wParam == type, "got %04lx instead of MCI_NOTIFY_xyz %04lx from command %s\n", msg.wParam, type, command); } +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), 0, 0); + return lstrcmpA(buf, stra); +} + static void test_mciParser(HWND hwnd) { MCIERROR err; @@ -385,6 +392,9 @@ static void test_openCloseWAVE(HWND hwnd) ok(!err,"mci close shareable returned %s\n", dbg_mcierr(err)); } + err = mciGetDeviceID("waveaudio"); + ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + err = mciSendString(command_open, buf, sizeof(buf), hwnd); ok(!err,"mci %s returned %s\n", command_open, dbg_mcierr(err)); ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); @@ -427,24 +437,27 @@ static void test_openCloseWAVE(HWND hwnd) /* MCI_..._PARMSA and PARMSW share the same layout, use one for both tests. */ err = mciSendCommandW(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME | MCI_SYSINFO_OPEN, (DWORD_PTR)&parm); ok(!err || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommandW MCI_SYSINFO all name 1 open buffer[8]: %s\n", dbg_mcierr(err)); - /* TODO strcmpW((LPWSTR)buf,"mysound") */ + if(!err) ok(!strcmp_wa((LPWSTR)buf,"mysound"), "sysinfo name 1 open contents\n"); + buf[0] = 'Y'; parm.sys.dwNumber = 1; parm.sys.wDeviceType = MCI_DEVTYPE_WAVEFORM_AUDIO; /* ignored */ parm.sys.lpstrReturn = buf; parm.sys.dwRetSize = 7; /* too short for mysound\0 */ err = mciSendCommandW(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME | MCI_SYSINFO_OPEN, (DWORD_PTR)&parm); ok(err==MCIERR_PARAM_OVERFLOW || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommandW MCI_SYSINFO all name 1 open too small: %s\n", dbg_mcierr(err)); + ok(!strcmp(buf,"Y"), "output buffer %s\n", buf); /* Win9x overwrites the tiny buffer and returns success, newer versions signal overflow. */ memset(buf, 0, sizeof(buf)); + buf[0] = 'Y'; parm.sys.dwNumber = 1; parm.sys.wDeviceType = MCI_DEVTYPE_WAVEFORM_AUDIO; /* ignored */ parm.sys.lpstrReturn = buf; parm.sys.dwRetSize = 2; /* too short for mysound\0 */ err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_NAME | MCI_SYSINFO_OPEN, (DWORD_PTR)&parm); ok(err==MCIERR_PARAM_OVERFLOW || broken(!err /* Win9x */),"mciCommand MCI_SYSINFO all name 1 open too small: %s\n", dbg_mcierr(err)); - if(!err) ok(!strcmp(buf,"mysound"), "sysinfo short name returned %s\n", buf); + ok(!strcmp(buf, err ? "Y" : "mysound"), "sysinfo short name returned %s\n", buf); err = mciSendString("sysinfo mysound quantity open", buf, sizeof(buf), hwnd); ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo alias quantity: %s\n", dbg_mcierr(err)); @@ -455,12 +468,26 @@ static void test_openCloseWAVE(HWND hwnd) err = mciSendString("sysinfo all installname", buf, sizeof(buf), hwnd); ok(err==MCIERR_CANNOT_USE_ALL,"sysinfo all installname: %s\n", dbg_mcierr(err)); + buf[0] = 'M'; buf[1] = 0; + parm.sys.lpstrReturn = buf; + parm.sys.dwRetSize = sizeof(buf); + err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_SYSINFO, MCI_SYSINFO_INSTALLNAME, (DWORD_PTR)&parm); + ok(err==MCIERR_CANNOT_USE_ALL,"mciCommand MCI_SYSINFO all installname: %s\n", dbg_mcierr(err)); + ok(!strcmp(buf,"M"), "output buffer %s\n", buf); + err = mciSendString("sysinfo nodev installname", buf, sizeof(buf), hwnd); ok(err==MCIERR_INVALID_DEVICE_NAME,"sysinfo nodev installname: %s\n", dbg_mcierr(err)); ok(!buf[0], "sysinfo error buffer %s\n", buf); + buf[0] = 'K'; + parm.sys.lpstrReturn = buf; + parm.sys.dwRetSize = sizeof(buf); + err = mciSendCommandW(24000, MCI_SYSINFO, MCI_SYSINFO_INSTALLNAME, (DWORD_PTR)&parm); + ok(err==MCIERR_INVALID_DEVICE_NAME || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommand MCI_SYSINFO nodev installname: %s\n", dbg_mcierr(err)); + ok(!strcmp(buf,"K"), "output buffer %s\n", buf); + err = mciGetDeviceID("all"); - ok(MCI_ALL_DEVICE_ID==err || /* Win9x */(UINT16)MCI_ALL_DEVICE_ID==err,"mciGetDeviceID all returned %u, expected %d\n", err, MCI_ALL_DEVICE_ID); + ok(MCI_ALL_DEVICE_ID==err || /* Win9x */(WORD)MCI_ALL_DEVICE_ID==err,"mciGetDeviceID all returned %u, expected %d\n", err, MCI_ALL_DEVICE_ID); err = mciSendString(command_close_my, NULL, 0, hwnd); ok(!err,"mci %s returned %s\n", command_close_my, dbg_mcierr(err));

1 0

Jörg Höhle : winmm: mciSendString always returns a response string (albeit empty).
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 88a8d211fb6ad131b4eb6ee35701b573116327cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a8d211fb6ad131b4eb6ee35… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Sep 21 19:28:20 2010 +0200 winmm: mciSendString always returns a response string (albeit empty). --- dlls/winmm/mci.c | 8 +++++--- dlls/winmm/tests/mci.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index cb76a1e..455a733 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1535,8 +1535,10 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, 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.generic, lpstrRet, uRetLen); - TRACE("=> 2/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); + if (!LOWORD(dwRet)) { + dwRet = MCI_HandleReturnValues(dwRet, wmd, retType, &data.generic, lpstrRet, uRetLen); + TRACE("=> 2/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); + } errCleanUp: if (auto_open) { @@ -1569,9 +1571,9 @@ DWORD WINAPI mciSendStringA(LPCSTR lpstrCommand, LPSTR lpstrRet, MultiByteToWideChar( CP_ACP, 0, lpstrCommand, -1, lpwstrCommand, len ); if (lpstrRet) { + if (uRetLen) *lpstrRet = '\0'; /* NT-w2k3 use memset(lpstrRet, 0, uRetLen); */ lpwstrRet = HeapAlloc(GetProcessHeap(), 0, uRetLen * sizeof(WCHAR)); if (!lpwstrRet) { - WARN("no memory\n"); HeapFree( GetProcessHeap(), 0, lpwstrCommand ); return MCIERR_OUT_OF_MEMORY; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index ce91458..ebd393f 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -189,11 +189,15 @@ static void test_mciParser(HWND hwnd) err = mciSendString("open avivideo alias a", buf, sizeof(buf), hwnd); ok(!err,"open another: %s\n", dbg_mcierr(err)); + buf[0]='z'; err = mciSendString("", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_MISSING_COMMAND_STRING,"empty string: %s\n", dbg_mcierr(err)); + ok(!buf[0], "error buffer %s\n", buf); + buf[0]='d'; err = mciSendString("open", buf, sizeof(buf), NULL); ok(err==MCIERR_MISSING_DEVICE_NAME,"open void: %s\n", dbg_mcierr(err)); + ok(!buf[0], "open error buffer %s\n", buf); err = mciSendString("open notify", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_INVALID_DEVICE_NAME,"open notify: %s\n", dbg_mcierr(err)); @@ -214,15 +218,19 @@ static void test_mciParser(HWND hwnd) 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)); + buf[0]='I'; 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)); + ok(!buf[0], "set error buffer %s\n", buf); /* 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)); + buf[0]='G'; err = mciSendString("status a", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_UNSUPPORTED_FUNCTION,"status avivideo nokeyword: %s\n", dbg_mcierr(err)); + ok(!buf[0], "status error buffer %s\n", buf); 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)); @@ -283,6 +291,7 @@ static void test_mciParser(HWND hwnd) * 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)); + ok(!buf[0], "pause error buffer %s\n", buf); /* MCI_STATUS' dwReturn is a DWORD_PTR, others' a plain DWORD. */ parm.status.dwItem = MCI_STATUS_TIME_FORMAT; @@ -448,6 +457,7 @@ static void test_openCloseWAVE(HWND hwnd) err = mciSendString("sysinfo nodev installname", buf, sizeof(buf), hwnd); ok(err==MCIERR_INVALID_DEVICE_NAME,"sysinfo nodev installname: %s\n", dbg_mcierr(err)); + ok(!buf[0], "sysinfo error buffer %s\n", buf); err = mciGetDeviceID("all"); ok(MCI_ALL_DEVICE_ID==err || /* Win9x */(UINT16)MCI_ALL_DEVICE_ID==err,"mciGetDeviceID all returned %u, expected %d\n", err, MCI_ALL_DEVICE_ID); @@ -584,6 +594,7 @@ static void test_recordWAVE(HWND hwnd) /* Info file fails until named in Open or Save. */ err = mciSendString("info x file", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_NONAPPLICABLE_FUNCTION,"mci info new file returned %s\n", dbg_mcierr(err)); + ok(!buf[0], "info error buffer %s\n", buf); /* Check the default recording: 8-bits per sample, mono, 11kHz */ err = mciSendString("status x samplespersec", buf, sizeof(buf), NULL);

1 0

David Adam : ddraw: Add tests for SetCooperativeLevel with a NULL window.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: e5e150a4d60dbb150cc032d70cadb0f8ff04637d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e150a4d60dbb150cc032d70… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Mon Nov 1 22:32:52 2010 +0100 ddraw: Add tests for SetCooperativeLevel with a NULL window. --- dlls/ddraw/tests/ddrawmodes.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index e83541a..3aecb63 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -554,6 +554,10 @@ static void testcooperativelevels_normal(void) /* Do some tests with DDSCL_NORMAL mode */ /* Fullscreen mode + normal mode + exclusive mode */ + + rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_NORMAL); + ok(rc==DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, received: %x\n", rc); + sfw=FALSE; if(hwnd2) sfw=SetForegroundWindow(hwnd2); @@ -583,6 +587,7 @@ static void testcooperativelevels_normal(void) ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_EXCLUSIVE | DDSCL_NORMAL) returned: %x\n",rc); /* Fullscreen mode + normal mode */ + sfw=FALSE; if(hwnd2) sfw=SetForegroundWindow(hwnd2); @@ -592,6 +597,9 @@ static void testcooperativelevels_normal(void) if(sfw) ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); + rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_FULLSCREEN | DDSCL_NORMAL); + todo_wine ok(rc==DD_OK, "Expected DD_OK, received %x\n", rc); + /* Try creating a double buffered primary in fullscreen + normal mode */ rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); if (rc == DDERR_UNSUPPORTEDMODE) @@ -605,6 +613,7 @@ static void testcooperativelevels_normal(void) if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); /* switching from Fullscreen mode to Normal mode */ + sfw=FALSE; if(hwnd2) sfw=SetForegroundWindow(hwnd2); @@ -615,6 +624,9 @@ static void testcooperativelevels_normal(void) if(sfw) ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); + rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL); + ok(rc==DD_OK, "Expected DD_OK, received %x\n", rc); + /* Try creating a double buffered primary in normal mode */ rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); if (rc == DDERR_UNSUPPORTEDMODE) @@ -627,6 +639,7 @@ static void testcooperativelevels_normal(void) if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); /* switching from Normal mode to Fullscreen + Normal mode */ + sfw=FALSE; if(hwnd2) sfw=SetForegroundWindow(hwnd2); @@ -637,11 +650,24 @@ static void testcooperativelevels_normal(void) if(sfw) ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); + rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL | DDSCL_FULLSCREEN); + todo_wine ok(rc==DD_OK, "Expected DD_OK, received %x\n", rc); + /* Set the focus window */ rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW); ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW) returned: %x\n",rc); + rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_SETFOCUSWINDOW); + + if (rc == DDERR_INVALIDPARAMS) + { + win_skip("NT4/Win95 do not support cooperative levels DDSCL_SETDEVICEWINDOW and DDSCL_SETFOCUSWINDOW\n"); + return; + } + + ok(rc==DD_OK, "Expected DD_OK, received %x\n", rc); + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_SETFOCUSWINDOW); @@ -733,6 +759,10 @@ static void testcooperativelevels_exclusive(void) ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_FULLSCREEN) returned: %x\n",rc); /* Full screen mode + exclusive mode */ + + rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE); + todo_wine ok(rc==DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, received %x\n", rc); + sfw=FALSE; if(hwnd2) sfw=SetForegroundWindow(hwnd2);

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: aa93d7b80d342f1773d00811bdb3166a1cfe4be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa93d7b80d342f1773d00811b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 11:02:17 2010 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/dsurface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 14fb87c..ee221ce 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2900,10 +2900,10 @@ static void SurfaceCapsTest(void) if (create.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) { create.dwFlags |= DDSD_PIXELFORMAT; - U4(create).ddpfPixelFormat.dwSize = sizeof(U4(create).ddpfPixelFormat); - U4(create).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; - U1(U4(create).ddpfPixelFormat).dwZBufferBitDepth = 16; - U3(U4(create).ddpfPixelFormat).dwZBitMask = 0x0000FFFF; + create.ddpfPixelFormat.dwSize = sizeof(create.ddpfPixelFormat); + create.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(create.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(create.ddpfPixelFormat).dwZBitMask = 0x0000FFFF; } hr = IDirectDraw_CreateSurface(lpDD, &create, &surface1, NULL);

1 0

Thomas Mullaly : urlmon: Implemented base case for CoInternetCombineIUri.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: bced2e21dbc548ef9d41e3ff11384d7ad964c929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bced2e21dbc548ef9d41e3ff1… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Oct 9 11:02:17 2010 -0400 urlmon: Implemented base case for CoInternetCombineIUri. --- dlls/urlmon/tests/uri.c | 97 +++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 66 +++++++++++++++++++++++++++++++- 2 files changed, 158 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 7958fed..eb5a3f7 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5578,7 +5578,7 @@ static const uri_combine_test uri_combine_tests[] = { }, { "http://google.com/test",0, "zip://test.com/cool",0, - 0,S_OK,TRUE, + 0,S_OK,FALSE, { {"zip://test.com/cool",S_OK}, {"test.com",S_OK}, @@ -5899,6 +5899,95 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_FILE,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + /* URL_DONT_SIMPLIFY has no effect. */ + { "http://google.com/test",0, + "zip://test.com/cool/../cool/test",0, + URL_DONT_SIMPLIFY,S_OK,FALSE, + { + {"zip://test.com/cool/test",S_OK}, + {"test.com",S_OK}, + {"zip://test.com/cool/test",S_OK}, + {"test.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"test.com",S_OK}, + {"",S_FALSE}, + {"/cool/test",S_OK}, + {"/cool/test",S_OK}, + {"",S_FALSE}, + /* The resulting IUri has the same Raw URI as the relative URI (only IE 8). + * On IE 7 it reduces the path in the Raw URI. + */ + {"zip://test.com/cool/../cool/test",S_OK,FALSE,"zip://test.com/cool/test"}, + {"zip",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_UNKNOWN,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + /* FILE_USE_PATHURL has no effect in IE 8, in IE 7 the + * resulting URI is converted into a dos path. + */ + { "http://google.com/test",0, + "file:///c:/test/",0, + URL_FILE_USE_PATHURL,S_OK,FALSE, + { + {"file:///c:/test/",S_OK,FALSE,"file://c:\\test\\"}, + {"",S_FALSE}, + {"file:///c:/test/",S_OK,FALSE,"file://c:\\test\\"}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/c:/test/",S_OK,FALSE,"c:\\test\\"}, + {"/c:/test/",S_OK,FALSE,"c:\\test\\"}, + {"",S_FALSE}, + {"file:///c:/test/",S_OK,FALSE,"file://c:\\test\\"}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_FILE,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://google.com/test",0, + "http://test.com/test#%30test",0, + URL_DONT_UNESCAPE_EXTRA_INFO,S_OK,FALSE, + { + {"http://test.com/test#0test",S_OK}, + {"test.com",S_OK}, + {"http://test.com/test#0test",S_OK}, + {"test.com",S_OK}, + {"",S_FALSE}, + {"#0test",S_OK}, + {"test.com",S_OK}, + {"",S_FALSE}, + {"/test",S_OK}, + {"/test",S_OK}, + {"",S_FALSE}, + /* IE 7 decodes the %30 to a 0 in the Raw URI. */ + {"http://test.com/test#%30test",S_OK,FALSE,"http://test.com/test#0test"}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; @@ -9072,7 +9161,8 @@ static void test_CoInternetCombineIUri(void) { hr, prop.expected, i, j); } todo_wine { - ok(!strcmp_aw(prop.value, received), + ok(!strcmp_aw(prop.value, received) || + broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", prop.value, wine_dbgstr_w(received), i, j); } @@ -9080,7 +9170,8 @@ static void test_CoInternetCombineIUri(void) { ok(hr == prop.expected, "Error: IUri_GetPropertyBSTR returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].str_props[%d].\n", hr, prop.expected, i, j); - ok(!strcmp_aw(prop.value, received), + ok(!strcmp_aw(prop.value, received) || + broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", prop.value, wine_dbgstr_w(received), i, j); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e6304e8..3e29575 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5589,12 +5589,63 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve return S_OK; } +static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result) { + Uri *ret; + HRESULT hr; + parse_data data; + + /* Base case is when the relative Uri has a scheme name, + * if it does, then 'result' will contain the same data + * as the relative Uri. + */ + if(relative->scheme_start > -1) { + DWORD create_flags = 0; + + memset(&data, 0, sizeof(parse_data)); + + data.uri = SysAllocString(relative->raw_uri); + if(!data.uri) { + IUri_Release(URI(ret)); + *result = NULL; + return E_OUTOFMEMORY; + } + + parse_uri(&data, 0); + + ret = create_uri_obj(); + if(!ret) { + *result = NULL; + return E_OUTOFMEMORY; + } + + ret->raw_uri = data.uri; + hr = canonicalize_uri(&data, ret, 0); + if(FAILED(hr)) { + IUri_Release(URI(ret)); + *result = NULL; + return hr; + } + + apply_default_flags(&create_flags); + ret->create_flags = create_flags; + + *result = URI(ret); + } else { + *result = NULL; + return E_NOTIMPL; + } + + return S_OK; +} + /*********************************************************************** * CoInternetCombineIUri (urlmon.@) */ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD dwCombineFlags, IUri **ppCombinedUri, DWORD_PTR dwReserved) { + HRESULT hr; + Uri *relative, *base; TRACE("(%p %p %x %p %x)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); if(!ppCombinedUri) @@ -5605,6 +5656,17 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d return E_INVALIDARG; } - FIXME("(%p %p %x %p %x): stub\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); - return E_NOTIMPL; + relative = get_uri_obj(pRelativeUri); + base = get_uri_obj(pBaseUri); + if(!relative || !base) { + *ppCombinedUri = NULL; + FIXME("(%p %p %x %p %x) Unknown IUri types not supported yet.\n", + pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + return E_NOTIMPL; + } + + hr = combine_uri(base, relative, dwCombineFlags, ppCombinedUri); + if(hr == E_NOTIMPL) + FIXME("(%p %p %x %p %x): stub\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + return hr; }

1 0

Thomas Mullaly : urlmon/tests: Added actual CoInternetCombineIUri tests.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 2d61633e4d36c6934a6a586d95b441524be40ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d61633e4d36c6934a6a586d9… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Oct 7 19:41:46 2010 -0400 urlmon/tests: Added actual CoInternetCombineIUri tests. --- dlls/urlmon/tests/uri.c | 456 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 456 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d61633e4d36c6934a6a5…

1 0

Thomas Mullaly : urlmon/tests: Added basic tests for CoInternetCombineIUri.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 18c7070b7f47a908567c737808c1cfeeead7e11c URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c7070b7f47a908567c73780… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Oct 7 19:22:44 2010 -0400 urlmon/tests: Added basic tests for CoInternetCombineIUri. --- dlls/urlmon/tests/uri.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 10 ++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 93493a8..39cfaaa 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -36,6 +36,7 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); static HRESULT (WINAPI *pCreateUriWithFragment)(LPCWSTR, LPCWSTR, DWORD, DWORD_PTR, IUri**); static HRESULT (WINAPI *pCreateIUriBuilder)(IUri*, DWORD, DWORD_PTR, IUriBuilder**); +static HRESULT (WINAPI *pCoInternetCombineIUri)(IUri*,IUri*,DWORD,IUri**,DWORD_PTR); static const WCHAR http_urlW[] = { 'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', '.','o','r','g','/',0}; @@ -8633,6 +8634,37 @@ static void test_IUriBuilder_Misc(void) { if(uri) IUri_Release(uri); } +static void test_CoInternetCombineIUri(void) { + HRESULT hr; + IUri *base, *relative, *result; + + base = NULL; + hr = pCreateUri(http_urlW, 0, 0, &base); + ok(SUCCEEDED(hr), "Error: Expected CreateUri to succeed, got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) { + result = (void*) 0xdeadbeef; + hr = pCoInternetCombineIUri(base, NULL, 0, &result, 0); + ok(hr == E_INVALIDARG, "Error: CoInternetCombineIUri returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + ok(!result, "Error: Expected 'result' to be NULL, was %p.\n", result); + } + + relative = NULL; + hr = pCreateUri(http_urlW, 0, 0, &relative); + ok(SUCCEEDED(hr), "Error: Expected CreateUri to succeed, got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) { + result = (void*) 0xdeadbeef; + hr = pCoInternetCombineIUri(NULL, relative, 0, &result, 0); + ok(hr == E_INVALIDARG, "Error: CoInternetCombineIUri returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + ok(!result, "Error: Expected 'result' to be NULL, was %p.\n", result); + } + + hr = pCoInternetCombineIUri(base, relative, 0, NULL, 0); + ok(hr == E_INVALIDARG, "Error: CoInternetCombineIUri returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + + if(base) IUri_Release(base); + if(relative) IUri_Release(relative); +} + START_TEST(uri) { HMODULE hurlmon; @@ -8640,6 +8672,7 @@ START_TEST(uri) { pCreateUri = (void*) GetProcAddress(hurlmon, "CreateUri"); pCreateUriWithFragment = (void*) GetProcAddress(hurlmon, "CreateUriWithFragment"); pCreateIUriBuilder = (void*) GetProcAddress(hurlmon, "CreateIUriBuilder"); + pCoInternetCombineIUri = (void*) GetProcAddress(hurlmon, "CoInternetCombineIUri"); if(!pCreateUri) { win_skip("CreateUri is not present, skipping tests.\n"); @@ -8711,4 +8744,7 @@ START_TEST(uri) { trace("test IUriBuilder miscellaneous...\n"); test_IUriBuilder_Misc(); + + trace("test CoInternetCombineIUri...\n"); + test_CoInternetCombineIUri(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 99906d2..e6304e8 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5595,6 +5595,16 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD dwCombineFlags, IUri **ppCombinedUri, DWORD_PTR dwReserved) { + TRACE("(%p %p %x %p %x)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + + if(!ppCombinedUri) + return E_INVALIDARG; + + if(!pBaseUri || !pRelativeUri) { + *ppCombinedUri = NULL; + return E_INVALIDARG; + } + FIXME("(%p %p %x %p %x): stub\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon: Added stub for CoInternetCombineIUri.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 2aed8ce2fd095468492640af98a0be8692536b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aed8ce2fd095468492640af9… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Oct 7 19:04:21 2010 -0400 urlmon: Added stub for CoInternetCombineIUri. --- dlls/urlmon/uri.c | 10 ++++++++++ dlls/urlmon/urlmon.spec | 1 + include/urlmon.idl | 1 + 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 49368b1..99906d2 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5588,3 +5588,13 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve *ppIUriBuilder = URIBUILDER(ret); return S_OK; } + +/*********************************************************************** + * CoInternetCombineIUri (urlmon.@) + */ +HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD dwCombineFlags, + IUri **ppCombinedUri, DWORD_PTR dwReserved) +{ + FIXME("(%p %p %x %p %x): stub\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 6109385..ff1adea 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -12,6 +12,7 @@ @ stub CoInstall @ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long) @ stdcall CoInternetCompareUrl(wstr wstr long) +@ stdcall CoInternetCombineIUri(ptr ptr long ptr long) @ stdcall CoInternetCreateSecurityManager(ptr ptr long) @ stdcall CoInternetCreateZoneManager(ptr ptr long) @ stub CoInternetGetProtocolFlags diff --git a/include/urlmon.idl b/include/urlmon.idl index b09eba3..e50975d 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1931,6 +1931,7 @@ cpp_quote("HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx*,DWORD,IBindStatusCallba cpp_quote("HRESULT WINAPI CoInternetCreateSecurityManager(IServiceProvider*,IInternetSecurityManager**,DWORD);") cpp_quote("HRESULT WINAPI CoInternetCombineUrl(LPCWSTR,LPCWSTR,DWORD,LPWSTR,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetCompareUrl(LPCWSTR,LPCWSTR,DWORD);") +cpp_quote("HRESULT WINAPI CoInternetCombineIUri(IUri*,IUri*,DWORD,IUri**,DWORD_PTR);") cpp_quote("HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider*, IInternetZoneManager**, DWORD);") cpp_quote("HRESULT WINAPI CoInternetParseUrl(LPCWSTR,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetQueryInfo(LPCWSTR,QUERYOPTION,DWORD,LPVOID,DWORD,DWORD*,DWORD);")

1 0

Eryk Wieliczko : msvcrt: Implement _findfirst64i32 and _findnext64i32.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 566d8e5eaafbb97ad93ac1e7ddf0b369719f3c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=566d8e5eaafbb97ad93ac1e7d… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Mon Nov 1 20:52:22 2010 +0100 msvcrt: Implement _findfirst64i32 and _findnext64i32. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/dir.c | 59 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 + 5 files changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1e40d01..2f23ff0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -620,11 +620,11 @@ @ stub _findfirst32 @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 -@ stub _findfirst64i32 +@ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 @ stub _findnext32 @ stub _findnext32i64 @ cdecl _findnext64(long ptr) msvcrt._findnext64 -@ stub _findnext64i32 +@ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 @ cdecl _finite( double ) msvcrt._finite @ cdecl _flsbuf(long ptr) msvcrt._flsbuf @ cdecl _flushall() msvcrt._flushall diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 86235aa..5f0198c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -461,11 +461,11 @@ @ stub _findfirst32 @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 -@ stub _findfirst64i32 +@ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 @ stub _findnext32 @ stub _findnext32i64 @ cdecl _findnext64(long ptr) msvcrt._findnext64 -@ stub _findnext64i32 +@ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 @ cdecl _finite( double ) msvcrt._finite @ cdecl _flsbuf(long ptr) msvcrt._flsbuf @ cdecl _flushall() msvcrt._flushall diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 39bd039..7a53b7b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -453,11 +453,11 @@ @ stub _findfirst32 @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 -@ stub _findfirst64i32 +@ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 @ stub _findnext32 @ stub _findnext32i64 @ cdecl _findnext64(long ptr) msvcrt._findnext64 -@ stub _findnext64i32 +@ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 @ cdecl _finite( double ) msvcrt._finite @ cdecl _flsbuf(long ptr) msvcrt._flsbuf @ cdecl _flushall() msvcrt._flushall diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 5b5f641..b45a459 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -116,6 +116,25 @@ static void msvcrt_fttofd64( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata strcpy(ft->name, fd->cFileName); } +/* INTERNAL: Translate WIN32_FIND_DATAA to finddata64i32_t */ +static void msvcrt_fttofd64i32( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata64i32_t* ft) +{ + DWORD dw; + + if (fd->dwFileAttributes == FILE_ATTRIBUTE_NORMAL) + ft->attrib = 0; + else + ft->attrib = fd->dwFileAttributes; + + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftCreationTime, &dw ); + ft->time_create = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastAccessTime, &dw ); + ft->time_access = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastWriteTime, &dw ); + ft->time_write = dw; + ft->size = fd->nFileSizeLow; + strcpy(ft->name, fd->cFileName); +} /* INTERNAL: Translate WIN32_FIND_DATAW to wfinddatai64_t */ static void msvcrt_wfttofdi64( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfinddatai64_t* ft) @@ -330,6 +349,27 @@ MSVCRT_intptr_t CDECL MSVCRT__findfirst64(const char * fspec, struct MSVCRT__fin } /********************************************************************* + * _findfirst64i32 (MSVCRT.@) + * + * 64-bit/32-bit version of _findfirst. + */ +MSVCRT_intptr_t CDECL MSVCRT__findfirst64i32(const char * fspec, struct MSVCRT__finddata64i32_t* ft) +{ + WIN32_FIND_DATAA find_data; + HANDLE hfind; + + hfind = FindFirstFileA(fspec, &find_data); + if (hfind == INVALID_HANDLE_VALUE) + { + msvcrt_set_errno(GetLastError()); + return -1; + } + msvcrt_fttofd64i32(&find_data,ft); + TRACE(":got handle %p\n",hfind); + return (MSVCRT_intptr_t)hfind; +} + +/********************************************************************* * _wfindfirsti64 (MSVCRT.@) * * Unicode version of _findfirsti64. @@ -438,6 +478,25 @@ int CDECL MSVCRT__findnext64(long hand, struct MSVCRT__finddata64_t * ft) } /********************************************************************* + * _findnext64i32 (MSVCRT.@) + * + * 64-bit/32-bit version of _findnext. + */ +int CDECL MSVCRT__findnext64i32(long hand, struct MSVCRT__finddata64i32_t * ft) +{ + WIN32_FIND_DATAA find_data; + + if (!FindNextFileA((HANDLE)hand, &find_data)) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } + + msvcrt_fttofd64i32(&find_data,ft); + return 0; +} + +/********************************************************************* * _wfindnexti64 (MSVCRT.@) * * Unicode version of _findnexti64. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ffe5506..eb0d8ec 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -412,9 +412,11 @@ @ cdecl _findclose(long) MSVCRT__findclose @ cdecl _findfirst(str ptr) MSVCRT__findfirst @ cdecl _findfirst64(str ptr) MSVCRT__findfirst64 +@ cdecl _findfirst64i32(str ptr) MSVCRT__findfirst64i32 @ cdecl _findfirsti64(str ptr) MSVCRT__findfirsti64 @ cdecl _findnext(long ptr) MSVCRT__findnext @ cdecl _findnext64(long ptr) MSVCRT__findnext64 +@ cdecl _findnext64i32(long ptr) MSVCRT__findnext64i32 @ cdecl _findnexti64(long ptr) MSVCRT__findnexti64 @ cdecl _finite( double ) @ cdecl _flsbuf(long ptr) MSVCRT__flsbuf

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
87
Older →

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 November 2010