January 2006 - Wine-commits

Phil Krylov : riched20: Removed a useless check in painting code.
by Alexandre Julliard 12 Jan '06

12 Jan '06

Module: wine Branch: refs/heads/master Commit: 777d9bfacd1fc4433d6c37bb107debd6b894d523 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=777d9bfacd1fc4433d6c37b… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Thu Jan 12 11:54:37 2006 +0100 riched20: Removed a useless check in painting code. --- dlls/riched20/paint.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 94f0bf3..6e4cfb2 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -141,13 +141,7 @@ static void ME_MarkSelectionForRepaint(M void ME_Repaint(ME_TextEditor *editor) { ME_Cursor *pCursor = &editor->pCursors[0]; - ME_DisplayItem *pRun = NULL; - int nOffset = -1; - int nCharOfs = ME_CharOfsFromRunOfs(editor, pCursor->pRun, pCursor->nOffset); - - ME_RunOfsFromCharOfs(editor, nCharOfs, &pRun, &nOffset); - assert(pRun == pCursor->pRun); - assert(nOffset == pCursor->nOffset); + ME_MarkSelectionForRepaint(editor); if (ME_WrapMarkedParagraphs(editor)) { ME_UpdateScrollBar(editor);

1 0

Huw Davies : gdi: If the last param of GetKerningPairs is NULL then return the
by Alexandre Julliard 12 Jan '06

12 Jan '06

Module: wine Branch: refs/heads/master Commit: d2c60e53de48c602ac627111d8dfe543a3e49ac9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2c60e53de48c602ac62711… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 12 11:54:20 2006 +0100 gdi: If the last param of GetKerningPairs is NULL then return the number of pairs. --- dlls/gdi/font.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index f94bda1..e6a00a3 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -2467,6 +2467,10 @@ DWORD WINAPI GetKerningPairsW( HDC hDC, { unsigned int i; FIXME("(%p,%ld,%p): almost empty stub!\n", hDC, cPairs, lpKerningPairs); + + if(!lpKerningPairs) /* return the number of kerning pairs */ + return 0; + for (i = 0; i < cPairs; i++) lpKerningPairs[i].iKernAmount = 0; return 0;

1 0

Robert Shearman : shell: Fix view window Z order.
by Alexandre Julliard 12 Jan '06

12 Jan '06

Module: wine Branch: refs/heads/master Commit: d11069f8bb60f499d56d23a24552ce11f33eb1f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d11069f8bb60f499d56d23a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jan 12 11:54:03 2006 +0100 shell: Fix view window Z order. After creating the Shell View window we should call SetWindowPos to move the window on top of other child windows in the parent window. Also delay the showing of the window so that we can do more initialisation after window creation without it causing visual artifacts. --- dlls/shell32/shlview.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index a887c6e..f9f07ce 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1878,7 +1878,7 @@ static HRESULT WINAPI IShellView_fnCreat *phWnd = CreateWindowExA(0, SV_CLASS_NAME, NULL, - WS_CHILD | WS_VISIBLE | WS_TABSTOP, + WS_CHILD | WS_TABSTOP, prcView->left, prcView->top, prcView->right - prcView->left, @@ -1892,6 +1892,9 @@ static HRESULT WINAPI IShellView_fnCreat if(!*phWnd) return E_FAIL; + SetWindowPos(*phWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); + UpdateWindow(*phWnd); + return S_OK; }

1 0

Robert Shearman : oleaut: Support conversion of VT_SAFEARRAY into VT_ARRAY|type.
by Alexandre Julliard 12 Jan '06

12 Jan '06

Module: wine Branch: refs/heads/master Commit: 9227902714c2b2111ca311375c47d485427e66cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9227902714c2b2111ca3113… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jan 12 11:53:47 2006 +0100 oleaut: Support conversion of VT_SAFEARRAY into VT_ARRAY|type. Typelib variant types that cannot be converted should return DISP_E_BADVARTYPE. Don't call DispCallFunc if conversion of one of the arguments failed. --- dlls/oleaut32/typelib.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b808243..31f5bad 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5008,7 +5008,7 @@ static HRESULT typedescvt_to_variantvt(I HRESULT hr = S_OK; /* enforce only one level of pointer indirection */ - if (!(*vt & VT_BYREF) && (tdesc->vt == VT_PTR)) + if (!(*vt & VT_BYREF) && !(*vt & VT_ARRAY) && (tdesc->vt == VT_PTR)) { tdesc = tdesc->u.lptdesc; @@ -5045,9 +5045,17 @@ static HRESULT typedescvt_to_variantvt(I case VT_USERDEFINED: hr = userdefined_to_variantvt(tinfo, tdesc, vt); break; + case VT_VOID: + case VT_CARRAY: case VT_PTR: - ERR("cannot convert VT_PTR into variant VT\n"); - hr = E_FAIL; + case VT_LPSTR: + case VT_LPWSTR: + ERR("cannot convert type %d into variant VT\n", tdesc->vt); + hr = DISP_E_BADVARTYPE; + break; + case VT_SAFEARRAY: + *vt |= VT_ARRAY; + hr = typedescvt_to_variantvt(tinfo, tdesc->u.lptdesc, vt); break; default: *vt |= tdesc->vt; @@ -5288,6 +5296,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke break; } } + if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */ if (func_desc->cParamsOpt < 0) { FIXME("Does not support safearray optional parameters\n");

1 0

Robert Shearman : ole: Fix crash in RpcChannelBuffer_SendReceive.
by Alexandre Julliard 12 Jan '06

12 Jan '06

Module: wine Branch: refs/heads/master Commit: f431353058b0f4a68f3493776f751e5a5b125137 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f431353058b0f4a68f34937… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jan 12 11:53:32 2006 +0100 ole: Fix crash in RpcChannelBuffer_SendReceive. Initialise apt to NULL since ipid_to_apt_stubbuffer no longer does this for us. --- dlls/ole32/rpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 31ef77c..58a3272 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -227,7 +227,7 @@ static HRESULT WINAPI RpcChannelBuffer_S DWORD index; struct dispatch_params *params; DWORD tid; - APARTMENT *apt; + APARTMENT *apt = NULL; IPID ipid; TRACE("(%p) iMethod=%ld\n", olemsg, olemsg->iMethod);

1 0

Robert Shearman : ole: Use strict prototypes for some test functions.
by Alexandre Julliard 12 Jan '06

12 Jan '06

Module: wine Branch: refs/heads/master Commit: 9ac3b28354682019f47548e4896baca69e9f4296 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9ac3b28354682019f47548e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Jan 12 11:53:19 2006 +0100 ole: Use strict prototypes for some test functions. --- dlls/ole32/tests/marshal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index cdd1ac9..a9eec4c 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -615,7 +615,7 @@ static DWORD CALLBACK no_couninitialize_ /* tests apartment that an apartment with a stub is released without deadlock * if the owning thread exits */ -static void test_no_couninitialize_server() +static void test_no_couninitialize_server(void) { HRESULT hr; IStream *pStream = NULL; @@ -679,7 +679,7 @@ static DWORD CALLBACK no_couninitialize_ } /* tests STA -> STA call during DLL_THREAD_DETACH doesn't deadlock */ -static void test_no_couninitialize_client() +static void test_no_couninitialize_client(void) { HRESULT hr; IStream *pStream = NULL; @@ -1564,7 +1564,7 @@ static const IClassFactoryVtbl TestClass static IClassFactory TestOOP_ClassFactory = { &TestClassFactoryOOP_Vtbl }; /* tests functions commonly used by out of process COM servers */ -static void test_out_of_process_com() +static void test_out_of_process_com(void) { static const CLSID CLSID_WineOOPTest = { 0x5201163f,

1 0

Saulius Krasuckas : mscms: Null ID can make GetStandardColorSpaceProfile*() succeed.
by Alexandre Julliard 12 Jan '06

12 Jan '06

Module: wine Branch: refs/heads/master Commit: 6aa3d8a443bd4fc652def2711a9700c1bf0c7435 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6aa3d8a443bd4fc652def27… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Thu Jan 12 11:53:12 2006 +0100 mscms: Null ID can make GetStandardColorSpaceProfile*() succeed. --- dlls/mscms/tests/profile.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 830d6fb..8ac6200 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -502,6 +502,16 @@ do { "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); \ } while (0) +#define test_GSCSPA(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ +do { \ + size = dwSz; \ + SetLastError(0); \ + ret = pGetStandardColorSpaceProfileA(pMachName, dwProfID, pProfName, pdwSz);\ + GLE = GetLastError(); \ + ok( (!ret && GLE_OK) || (ret && !lstrcmpiA( pProfName, "" )), \ + "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); \ +} while (0) + static void test_GetStandardColorSpaceProfileA(void) { BOOL ret; @@ -533,7 +543,7 @@ static void test_GetStandardColorSpacePr todo_wine fail_GSCSPA(NULL, 0, NULL, &size, 0, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND)); todo_wine - fail_GSCSPA(NULL, 0, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); + test_GSCSPA(NULL, 0, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); /* Functional checks */ @@ -569,12 +579,23 @@ do { "GetStandardColorSpaceProfileW() returns %d (GLE=%ld)\n", ret, GLE ); \ } while (0) +#define test_GSCSPW(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ +do { \ + size = dwSz; \ + SetLastError(0); \ + ret = pGetStandardColorSpaceProfileW(pMachName, dwProfID, pProfName, pdwSz);\ + GLE = GetLastError(); \ + ok( (!ret && GLE_OK) || (ret && !lstrcmpiW( pProfName, emptyW )), \ + "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); \ +} while (0) + static void test_GetStandardColorSpaceProfileW(void) { BOOL ret; DWORD size, sizeP, GLE; WCHAR oldprofile[MAX_PATH]; WCHAR newprofile[MAX_PATH]; + WCHAR emptyW[] = {0}; sizeP = sizeof(newprofile); @@ -600,7 +621,7 @@ static void test_GetStandardColorSpacePr todo_wine fail_GSCSPW(NULL, 0, NULL, &size, 0, (GLE == ERROR_INSUFFICIENT_BUFFER || GLE == ERROR_FILE_NOT_FOUND)); todo_wine - fail_GSCSPW(NULL, 0, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); + test_GSCSPW(NULL, 0, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); /* Functional checks */

1 0

Jacek Caban : shlwapi: UrlCanonicalize: fix URL_DONT_SIMPLIFY.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 11a0c8cd39a33b1b1f2ccccca58d9428021acc1a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11a0c8cd39a33b1b1f2cccc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 11 21:15:31 2006 +0100 shlwapi: UrlCanonicalize: fix URL_DONT_SIMPLIFY. - URL_DONT_SIMPLIFY should change '/' <-> '\' - Better '/' / '\' handling --- dlls/shlwapi/tests/path.c | 7 + dlls/shlwapi/url.c | 259 ++++++++++++++++++++++----------------------- 2 files changed, 135 insertions(+), 131 deletions(-)

1 0

Huw Davies : msxml: Implement createNode, appendChild and insertAfter.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: 50c64c04df3dda252d567fdbca4757201d95b02e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50c64c04df3dda252d567fd… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 11 21:15:12 2006 +0100 msxml: Implement createNode, appendChild and insertAfter. --- dlls/msxml3/domdoc.c | 50 ++++++++++++++++++++++++++++++- dlls/msxml3/node.c | 58 ++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 171 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 7d9ad8a..388f2db 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -657,6 +657,14 @@ static HRESULT WINAPI domdoc_getElements return E_NOTIMPL; } +static DOMNodeType get_node_type(VARIANT Type) +{ + if(V_VT(&Type) == VT_I4) + return V_I4(&Type); + + FIXME("Unsupported variant type %x\n", V_VT(&Type)); + return 0; +} static HRESULT WINAPI domdoc_createNode( IXMLDOMDocument *iface, @@ -665,10 +673,46 @@ static HRESULT WINAPI domdoc_createNode( BSTR namespaceURI, IXMLDOMNode** node ) { - FIXME("\n"); - return E_NOTIMPL; -} + domdoc *This = impl_from_IXMLDOMDocument( iface ); + DOMNodeType node_type; + xmlNodePtr xmlnode = NULL; + xmlChar *xml_name; + xmlDocPtr xmldoc; + + TRACE("(%p)->(type,%s,%s,%p)\n", This, debugstr_w(name), debugstr_w(namespaceURI), node); + + node_type = get_node_type(Type); + TRACE("node_type %d\n", node_type); + xml_name = xmlChar_from_wchar((WCHAR*)name); + + if(!get_doc(This)) + { + xmldoc = xmlNewDoc(NULL); + xmldoc->_private = 0; + attach_xmlnode(This->node, (xmlNodePtr) xmldoc); + } + + switch(node_type) + { + case NODE_ELEMENT: + xmlnode = xmlNewDocNode(get_doc(This), NULL, xml_name, NULL); + *node = create_node(xmlnode); + TRACE("created %p\n", xmlnode); + break; + + default: + FIXME("unhandled node type %d\n", node_type); + break; + } + + HeapFree(GetProcessHeap(), 0, xml_name); + + if(xmlnode && *node) + return S_OK; + + return E_FAIL; +} static HRESULT WINAPI domdoc_nodeFromID( IXMLDOMDocument *iface, diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b067926..44d4b8f 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -375,8 +375,54 @@ static HRESULT WINAPI xmlnode_insertBefo VARIANT refChild, IXMLDOMNode** outNewChild) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + xmlNodePtr before_node, new_child_node; + IXMLDOMNode *before = NULL, *new; + HRESULT hr; + + TRACE("(%p)->(%p,var,%p)\n",This,newChild,outNewChild); + + switch(V_VT(&refChild)) + { + case VT_EMPTY: + case VT_NULL: + break; + + case VT_UNKNOWN: + hr = IUnknown_QueryInterface(V_UNKNOWN(&refChild), &IID_IXMLDOMNode, (LPVOID)&before); + if(FAILED(hr)) return hr; + break; + + case VT_DISPATCH: + hr = IDispatch_QueryInterface(V_DISPATCH(&refChild), &IID_IXMLDOMNode, (LPVOID)&before); + if(FAILED(hr)) return hr; + break; + + default: + FIXME("refChild var type %x\n", V_VT(&refChild)); + return E_FAIL; + } + + IXMLDOMNode_QueryInterface(newChild, &IID_IXMLDOMNode, (LPVOID)&new); + new_child_node = impl_from_IXMLDOMNode(new)->node; + TRACE("new_child_node %p This->node %p\n", new_child_node, This->node); + + if(before) + { + before_node = impl_from_IXMLDOMNode(before)->node; + xmlAddPrevSibling(before_node, new_child_node); + IXMLDOMNode_Release(before); + } + else + { + xmlAddChild(This->node, new_child_node); + } + + IXMLDOMNode_Release(new); + IXMLDOMNode_AddRef(newChild); + *outNewChild = newChild; + TRACE("ret S_OK\n"); + return S_OK; } static HRESULT WINAPI xmlnode_replaceChild( @@ -403,8 +449,12 @@ static HRESULT WINAPI xmlnode_appendChil IXMLDOMNode* newChild, IXMLDOMNode** outNewChild) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + VARIANT var; + + TRACE("(%p)->(%p,%p)\n", This, newChild, outNewChild); + VariantInit(&var); + return IXMLDOMNode_insertBefore(iface, newChild, var, outNewChild); } static HRESULT WINAPI xmlnode_hasChildNodes( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 49c303b..74b96ec 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -598,6 +598,75 @@ static void test_refs(void) } +static void test_create(void) +{ + HRESULT r; + VARIANT var; + BSTR str; + IXMLDOMDocument *doc; + IXMLDOMNode *root, *node, *child; + IUnknown *unk; + LONG ref; + + r = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); + if( r != S_OK ) + return; + + V_VT(&var) = VT_I4; + V_I4(&var) = NODE_ELEMENT; + str = SysAllocString( szlc ); + r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); + ok( r == S_OK, "returns %08lx\n", r ); + r = IXMLDOMDocument_appendChild( doc, node, &root ); + ok( r == S_OK, "returns %08lx\n", r ); + ok( node == root, "%p %p\n", node, root ); + + ref = IXMLDOMNode_AddRef( node ); + ok(ref == 3, "ref %ld\n", ref); + IXMLDOMNode_Release( node ); + + ref = IXMLDOMNode_Release( node ); + ok(ref == 1, "ref %ld\n", ref); + SysFreeString( str ); + + V_VT(&var) = VT_I4; + V_I4(&var) = NODE_ELEMENT; + str = SysAllocString( szbs ); + r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); + ok( r == S_OK, "returns %08lx\n", r ); + + ref = IXMLDOMNode_AddRef( node ); + ok(ref == 2, "ref = %ld\n", ref); + IXMLDOMNode_Release( node ); + + r = IXMLDOMNode_QueryInterface( node, &IID_IUnknown, (LPVOID*)&unk ); + ok( r == S_OK, "returns %08lx\n", r ); + + ref = IXMLDOMNode_AddRef( unk ); + ok(ref == 3, "ref = %ld\n", ref); + IXMLDOMNode_Release( unk ); + + V_VT(&var) = VT_EMPTY; + r = IXMLDOMNode_insertBefore( root, (IXMLDOMNode*)unk, var, &child ); + ok( r == S_OK, "returns %08lx\n", r ); + ok( unk == (IUnknown*)child, "%p %p\n", unk, child ); + IXMLDOMNode_Release( child ); + IUnknown_Release( unk ); + + + V_VT(&var) = VT_NULL; + V_DISPATCH(&var) = (IDispatch*)node; + r = IXMLDOMNode_insertBefore( root, node, var, &child ); + ok( r == S_OK, "returns %08lx\n", r ); + ok( node == child, "%p %p\n", node, child ); + IXMLDOMNode_Release( child ); + IXMLDOMNode_Release( node ); + IXMLDOMNode_Release( root ); + IXMLDOMDocument_Release( doc ); +} + + START_TEST(domdoc) { HRESULT r; @@ -608,6 +677,7 @@ START_TEST(domdoc) test_domdoc(); test_domnode(); test_refs(); + test_create(); CoUninitialize(); }

1 0

Vitaliy Margolen : winecfg: Simplify code a bit.
by Alexandre Julliard 11 Jan '06

11 Jan '06

Module: wine Branch: refs/heads/master Commit: dc6ca17838152c63923663790391e4fd5edeecbd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc6ca17838152c639236637… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Wed Jan 11 21:12:14 2006 +0100 winecfg: Simplify code a bit. Enable apply button when needed and don't enable when nothing changed. --- programs/winecfg/driveui.c | 38 ++++++++++---------------------------- 1 files changed, 10 insertions(+), 28 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 84a9d43..993cec9 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -270,8 +270,7 @@ static int fill_drives_list(HWND dialog) for(i = 0; i < 26; i++) { LVITEM item; - char *letter = 0; - int len; + char letter[4]; /* skip over any unused drives */ if (!drives[i].in_use) @@ -280,34 +279,19 @@ static int fill_drives_list(HWND dialog) if (drives[i].letter == 'C') drivec_present = TRUE; - len = snprintf(letter, 0, "%c:", 'A' + i); - len++; /* add a byte for the trailing null */ - - letter = HeapAlloc(GetProcessHeap(), 0, len); - snprintf(letter, len, "%c:", 'A' + i); + snprintf(letter, sizeof(letter), "%c:", 'A' + i); memset(&item, 0, sizeof(item)); - item.mask = LVIF_TEXT; + item.mask = LVIF_TEXT | LVIF_PARAM; item.iItem = count; item.iSubItem = 0; item.pszText = letter; item.cchTextMax = lstrlen(item.pszText); + item.lParam = (LPARAM) &drives[i]; lv_insert_item(dialog, &item); + lv_set_item_text(dialog, count, 1, drives[i].unixpath); - item.iSubItem = 1; - item.pszText = drives[i].unixpath; - item.cchTextMax = lstrlen(item.pszText); - - lv_set_item(dialog, &item); - - item.mask = LVIF_PARAM; - item.iSubItem = 0; - item.lParam = (LPARAM) &drives[i]; - - lv_set_item(dialog, &item); - - HeapFree(GetProcessHeap(), 0, letter); count++; } @@ -331,6 +315,8 @@ static void on_options_click(HWND dialog set_reg_key(config_key, "", "ShowDotFiles", "Y"); else set_reg_key(config_key, "", "ShowDotFiles", "N"); + + SendMessage(GetParent(dialog), PSM_CHANGED, 0, 0); } static void on_add_click(HWND dialog) @@ -659,11 +645,8 @@ static void browse_for_folder(HWND dialo hr = StrRetToStr(&strSelectedPath, pidlSelectedPath, &pszSelectedPath); SHFree(pidlSelectedPath); if (!SUCCEEDED(hr)) return; - - HeapFree(GetProcessHeap(), 0, current_drive->unixpath); - current_drive->unixpath = strdupA(pszSelectedPath); - fill_drives_list(dialog); - update_controls(dialog); + + set_text(dialog, IDC_EDIT_PATH, pszSelectedPath); CoTaskMemFree(pszSelectedPath); } @@ -736,8 +719,6 @@ DriveDlgProc (HWND dialog, UINT msg, WPA break; case BN_CLICKED: - SendMessage(GetParent(dialog), PSM_CHANGED, 0, 0); - switch (LOWORD(wParam)) { case IDC_SHOW_DOT_FILES: @@ -773,6 +754,7 @@ DriveDlgProc (HWND dialog, UINT msg, WPA case IDC_BUTTON_AUTODETECT: autodetect_drives(); fill_drives_list(dialog); + SendMessage(GetParent(dialog), PSM_CHANGED, 0, 0); break; case IDC_BUTTON_SHOW_HIDE_ADVANCED:

1 0