March 2014 - Wine-commits - list.winehq.org

Jacek Caban : kernel32: Skip reserved TLS tests on WinXP SP1.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: e168cd28db6dbd149cddb1a2d3f1eef90a32209d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e168cd28db6dbd149cddb1a2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 31 14:31:01 2014 +0200 kernel32: Skip reserved TLS tests on WinXP SP1. --- dlls/kernel32/tests/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 36414ec..1ea5fb3 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1644,8 +1644,8 @@ static void test_reserved_tls(void) DWORD tls; BOOL ret; - /* This seems to be a WinXP+ feature. */ - if(!pCreateActCtxW) { + /* This seems to be a WinXP SP2+ feature. */ + if(!pIsWow64Process) { win_skip("Skipping reserved TLS slot on too old Windows.\n"); return; }

1 0

Huw Davies : riched20: Add a helper to return the default line height and use that in EM_LINESCROLL.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 2f07df59f955606af1047e4ba6f612bd669eadf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f07df59f955606af1047e4ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 31 14:09:41 2014 +0100 riched20: Add a helper to return the default line height and use that in EM_LINESCROLL. --- dlls/riched20/editor.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1d17ef0..9262baf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2925,6 +2925,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +static inline int get_default_line_height( ME_TextEditor *editor ) +{ + int height = 0; + + if (editor->pBuffer && editor->pBuffer->pDefaultStyle) + height = editor->pBuffer->pDefaultStyle->tm.tmHeight; + if (height <= 0) height = 24; + + return height; +} static const char * const edit_messages[] = { "EM_GETSEL", @@ -3548,7 +3558,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { if (!(editor->styleFlags & ES_MULTILINE)) return FALSE; - ME_ScrollDown(editor, lParam * 8); /* FIXME follow the original */ + ME_ScrollDown( editor, lParam * get_default_line_height( editor ) ); return TRUE; } case WM_CLEAR: @@ -4221,14 +4231,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_VSCROLL: { int origNPos; - int lineHeight; + int lineHeight = get_default_line_height( editor ); origNPos = editor->vert_si.nPos; - lineHeight = 24; - - if (editor->pBuffer && editor->pBuffer->pDefaultStyle) - lineHeight = editor->pBuffer->pDefaultStyle->tm.tmHeight; - if (lineHeight <= 0) lineHeight = 24; switch(LOWORD(wParam)) {

1 0

Huw Davies : riched20: Keep track of fractions of WHEEL_DELTA when scrolling.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: fa50baf31f8849b4bfbc0db99455b77eb221e23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa50baf31f8849b4bfbc0db99… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 31 14:09:42 2014 +0100 riched20: Keep track of fractions of WHEEL_DELTA when scrolling. --- dlls/riched20/editor.c | 38 +++++++++++++++++++++++++++++--------- dlls/riched20/editstr.h | 1 + 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9262baf..1235a16 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2858,6 +2858,8 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->horz_si.nPage = 0; ed->horz_si.nPos = 0; + ed->wheel_remain = 0; + OleInitialize(NULL); return ed; @@ -2936,6 +2938,13 @@ static inline int get_default_line_height( ME_TextEditor *editor ) return height; } +static inline int calc_wheel_change( int *remain, int amount_per_click ) +{ + int change = amount_per_click * (float)*remain / WHEEL_DELTA; + *remain -= WHEEL_DELTA * change / amount_per_click; + return change; +} + static const char * const edit_messages[] = { "EM_GETSEL", "EM_SETSEL", @@ -4145,6 +4154,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_KILLFOCUS: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ editor->bHaveFocus = FALSE; + editor->wheel_remain = 0; ME_HideCaret(editor); ME_SendOldNotify(editor, EN_KILLFOCUS); return 0; @@ -4273,8 +4283,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_MOUSEWHEEL: { - int gcWheelDelta; - UINT pulScrollLines; + int delta; BOOL ctrl_is_down; if ((editor->nEventMask & ENM_MOUSEEVENTS) && @@ -4283,9 +4292,16 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; - gcWheelDelta = GET_WHEEL_DELTA_WPARAM(wParam); + delta = GET_WHEEL_DELTA_WPARAM(wParam); + + /* if scrolling changes direction, ignore left overs */ + if ((delta < 0 && editor->wheel_remain < 0) || + (delta > 0 && editor->wheel_remain > 0)) + editor->wheel_remain += delta; + else + editor->wheel_remain = delta; - if (abs(gcWheelDelta) >= WHEEL_DELTA) + if (editor->wheel_remain) { if (ctrl_is_down) { int numerator; @@ -4295,14 +4311,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } else { numerator = editor->nZoomNumerator * 100 / editor->nZoomDenominator; } - numerator = numerator + (gcWheelDelta / WHEEL_DELTA) * 10; + numerator += calc_wheel_change( &editor->wheel_remain, 10 ); if (numerator >= 10 && numerator <= 500) ME_SetZoom(editor, numerator, 100); } else { - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); - /* FIXME follow the original */ - if (pulScrollLines) - ME_ScrollDown(editor,pulScrollLines * (-gcWheelDelta / WHEEL_DELTA) * 8); + UINT max_lines = 3; + int lines = 0; + + SystemParametersInfoW( SPI_GETWHEELSCROLLLINES, 0, &max_lines, 0 ); + if (max_lines) + lines = calc_wheel_change( &editor->wheel_remain, (int)max_lines ); + if (lines) + ME_ScrollDown( editor, -lines * get_default_line_height( editor ) ); } } break; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 8ce56c3..f139c29 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -443,6 +443,7 @@ typedef struct tagME_TextEditor SCROLLINFO vert_si, horz_si; BOOL bMouseCaptured; + int wheel_remain; } ME_TextEditor; typedef struct tagME_Context

1 0

Jacek Caban : docobj.idl: Added some new OLECMDID values.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: db08d9ad16b3533f0bb6c80c53f2d4525178f205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db08d9ad16b3533f0bb6c80c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 31 15:28:19 2014 +0200 docobj.idl: Added some new OLECMDID values. --- include/docobj.idl | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/docobj.idl b/include/docobj.idl index c77e546..119d4ea 100644 --- a/include/docobj.idl +++ b/include/docobj.idl @@ -275,7 +275,18 @@ interface IOleCommandTarget : IUnknown OLECMDID_OPTICAL_GETZOOMRANGE = 64, OLECMDID_WINDOWSTATECHANGED = 65, OLECMDID_ACTIVEXINSTALLSCOPE = 66, - OLECMDID_UPDATETRAVELENTRY_DATARECOVERY = 67 + OLECMDID_UPDATETRAVELENTRY_DATARECOVERY = 67, + OLECMDID_SHOWTASKDLG = 68, + OLECMDID_POPSTATEEVENT = 69, + OLECMDID_VIEWPORT_MODE = 70, + OLECMDID_LAYOUT_VIEWPORT_WIDTH = 71, + OLECMDID_VISUAL_VIEWPORT_EXCLUDE_BOTTOM = 72, + OLECMDID_USER_OPTICAL_ZOOM = 73, + OLECMDID_PAGEAVAILABLE = 74, + OLECMDID_GETUSERSCALABLE = 75, + OLECMDID_UPDATE_CARET = 76, + OLECMDID_ENABLE_VISIBILITY = 77, + OLECMDID_MEDIA_PLAYBACK = 78 } OLECMDID; HRESULT QueryStatus(

1 0

Jacek Caban : ieframe: Fixed some tests on IE11.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 1d67d66efc5278852dbafa4919443f27900016c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d67d66efc5278852dbafa491… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 31 15:28:28 2014 +0200 ieframe: Fixed some tests on IE11. --- dlls/ieframe/tests/webbrowser.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index ce96edf..4bf7949 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -419,10 +419,12 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID CHECK_EXPECT(Exec_IDM_STOP); return OLECMDERR_E_NOTSUPPORTED; case OLECMDID_UPDATETRAVELENTRY_DATARECOVERY: + case OLECMDID_PAGEAVAILABLE: /* TODO (IE11) */ + return E_NOTIMPL; case 6058: /* TODO */ return E_NOTIMPL; default: - ok(0, "unexpected nsCmdID %d\n", nCmdID); + ok(0, "unexpected nCmdID %d\n", nCmdID); } }else if(IsEqualGUID(&CGID_Explorer, pguidCmdGroup)) { switch(nCmdID) { @@ -437,6 +439,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 101: /* TODO (IE8) */ case 109: /* TODO (IE9) */ case 113: /* TODO (IE10) */ + case 119: /* IE11 */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID); @@ -444,11 +447,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID }else if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { switch(nCmdID) { case 105: /* TODO */ + case 133: /* IE11 */ case 134: /* TODO (IE10) */ + case 135: /* IE11 */ case 136: /* TODO (IE10) */ case 138: /* TODO */ case 140: /* TODO (Win7) */ case 144: /* TODO */ + case 178: /* IE11 */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID);

1 0

Stefan Dösinger : wined3d: Raise MaxPrimitiveCount and MaxVertexIndex.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 62f7ba2555c475a65ad6bf143780b24fbb3d0664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f7ba2555c475a65ad6bf143… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 28 21:03:46 2014 +0100 wined3d: Raise MaxPrimitiveCount and MaxVertexIndex. --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ef81278..86d0fcc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4473,8 +4473,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxAnisotropy = gl_info->limits.anisotropy; caps->MaxPointSize = gl_info->limits.pointsize_max; - caps->MaxPrimitiveCount = 0xfffff; /* For now set 2^20-1 which is used by most >=Geforce3/Radeon8500 cards */ - caps->MaxVertexIndex = 0xfffff; + caps->MaxPrimitiveCount = 0x555555; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ + caps->MaxVertexIndex = 0xffffff; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ caps->MaxStreams = MAX_STREAMS; caps->MaxStreamStride = 1024;

1 0

Nikolay Sivov : scrrun: Added IsReady property for a drive.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: f6efe2268b0025110938846ae77cf79c029fc355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6efe2268b0025110938846ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 30 15:58:30 2014 +0400 scrrun: Added IsReady property for a drive. --- dlls/scrrun/filesystem.c | 13 +++++++++++-- dlls/scrrun/tests/filesystem.c | 24 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 33344e4..d963719 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -788,8 +788,17 @@ static HRESULT WINAPI drive_get_SerialNumber(IDrive *iface, LONG *serial) static HRESULT WINAPI drive_get_IsReady(IDrive *iface, VARIANT_BOOL *ready) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, ready); - return E_NOTIMPL; + ULARGE_INTEGER freespace; + BOOL ret; + + TRACE("(%p)->(%p)\n", This, ready); + + if (!ready) + return E_POINTER; + + ret = GetDiskFreeSpaceExW(This->root, &freespace, NULL, NULL); + *ready = ret ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static const IDriveVtbl drivevtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 63b79fa..4128bf5 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1233,6 +1233,30 @@ static void test_DriveCollection(void) hr = IEnumVARIANT_Skip(enumvar, 1); ok(hr == S_FALSE, "got 0x%08x\n", hr); + /* reset and iterate again */ + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); + + while (IEnumVARIANT_Next(enumvar, 1, &var, &fetched) == S_OK) { + IDrive *drive = (IDrive*)V_DISPATCH(&var); + DriveTypeConst type; + + hr = IDrive_get_DriveType(drive, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDrive_get_IsReady(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + if (type == Fixed) { + VARIANT_BOOL ready = VARIANT_FALSE; + + hr = IDrive_get_IsReady(drive, &ready); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ready == VARIANT_TRUE, "got %x\n", ready); + } + VariantClear(&var); + } + IEnumVARIANT_Release(enumvar); IDriveCollection_Release(drives); }

1 0

Nikolay Sivov : scrrun: Implement TotalSize property for a drive.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 2377fc099daf467e9b77e4e9d71d89f5b8d84554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2377fc099daf467e9b77e4e9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 30 15:58:45 2014 +0400 scrrun: Implement TotalSize property for a drive. --- dlls/scrrun/filesystem.c | 14 ++++++++++++-- dlls/scrrun/tests/filesystem.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d963719..04d649d 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -753,8 +753,18 @@ static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v) static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, v); - return E_NOTIMPL; + ULARGE_INTEGER total; + + TRACE("(%p)->(%p)\n", This, v); + + if (!v) + return E_POINTER; + + if (!GetDiskFreeSpaceExW(This->root, NULL, &total, NULL)) + return E_FAIL; + + V_VT(v) = VT_R8; + return VarR8FromUI8(total.QuadPart, &V_R8(v)); } static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 4128bf5..215df42 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1247,12 +1247,22 @@ static void test_DriveCollection(void) hr = IDrive_get_IsReady(drive, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IDrive_get_TotalSize(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + if (type == Fixed) { VARIANT_BOOL ready = VARIANT_FALSE; + VARIANT size; hr = IDrive_get_IsReady(drive, &ready); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ready == VARIANT_TRUE, "got %x\n", ready); + + V_VT(&size) = VT_EMPTY; + hr = IDrive_get_TotalSize(drive, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); } VariantClear(&var); }

1 0

Nikolay Sivov : scrrun: Implement AvailableSpace property for a drive.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: 61a3bd330210e21842b010c536422c18dac55eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a3bd330210e21842b010c53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 30 15:59:00 2014 +0400 scrrun: Implement AvailableSpace property for a drive. --- dlls/scrrun/filesystem.c | 16 +++++++++++++--- dlls/scrrun/tests/filesystem.c | 9 +++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 04d649d..a1eb6c1 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -736,11 +736,21 @@ static HRESULT WINAPI drive_get_RootFolder(IDrive *iface, IFolder **folder) return E_NOTIMPL; } -static HRESULT WINAPI drive_get_AvailableSpace(IDrive *iface, VARIANT *avail) +static HRESULT WINAPI drive_get_AvailableSpace(IDrive *iface, VARIANT *v) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, avail); - return E_NOTIMPL; + ULARGE_INTEGER avail; + + TRACE("(%p)->(%p)\n", This, v); + + if (!v) + return E_POINTER; + + if (!GetDiskFreeSpaceExW(This->root, &avail, NULL, NULL)) + return E_FAIL; + + V_VT(v) = VT_R8; + return VarR8FromUI8(avail.QuadPart, &V_R8(v)); } static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 215df42..3bf1209 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1250,6 +1250,9 @@ static void test_DriveCollection(void) hr = IDrive_get_TotalSize(drive, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IDrive_get_AvailableSpace(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + if (type == Fixed) { VARIANT_BOOL ready = VARIANT_FALSE; VARIANT size; @@ -1263,6 +1266,12 @@ static void test_DriveCollection(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + + V_VT(&size) = VT_EMPTY; + hr = IDrive_get_AvailableSpace(drive, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); } VariantClear(&var); }

1 0

Nikolay Sivov : scrrun: Implement DriveLetter property for a drive.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: c824cfa08c5a0e66b0fc75ebee1a5e2af56e86e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c824cfa08c5a0e66b0fc75ebe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 30 15:59:17 2014 +0400 scrrun: Implement DriveLetter property for a drive. --- dlls/scrrun/filesystem.c | 13 +++++++++++-- dlls/scrrun/tests/filesystem.c | 9 +++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index a1eb6c1..cd0ec2b 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -687,8 +687,17 @@ static HRESULT WINAPI drive_get_Path(IDrive *iface, BSTR *path) static HRESULT WINAPI drive_get_DriveLetter(IDrive *iface, BSTR *letter) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, letter); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, letter); + + if (!letter) + return E_POINTER; + + *letter = SysAllocStringLen(This->root, 1); + if (!*letter) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI drive_get_ShareName(IDrive *iface, BSTR *share_name) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 3bf1209..d947d15 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1240,10 +1240,19 @@ static void test_DriveCollection(void) while (IEnumVARIANT_Next(enumvar, 1, &var, &fetched) == S_OK) { IDrive *drive = (IDrive*)V_DISPATCH(&var); DriveTypeConst type; + BSTR str; hr = IDrive_get_DriveType(drive, &type); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDrive_get_DriveLetter(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IDrive_get_DriveLetter(drive, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(SysStringLen(str) == 1, "got string %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hr = IDrive_get_IsReady(drive, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr);

1 0