February 2009 - Wine-commits

Alexandre Julliard : winetest: Make sure the right-hand side links don' t get wrapped.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: tools Branch: master Commit: 1767d458d20ccce7616fb4a725d9e158046318b8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1767d458d20ccce7616fb4a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 8 20:06:22 2009 +0100 winetest: Make sure the right-hand side links don't get wrapped. --- winetest/build-index | 2 +- winetest/gather | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 2813ae8..6516cfa 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -186,7 +186,7 @@ EOF } } print OUT " <td class=\"links\"><a href=\"$gitweb?a=shortlog;h=$build->{name}\">shortlog</a>"; - print OUT " | <a href=\"../$build->{name}\">all tests</a></td></tr>\n"; + print OUT " | <a href=\"../$build->{name}\">all tests</a></td></tr>\n"; } print OUT "</table></body></html>\n"; close OUT; diff --git a/winetest/gather b/winetest/gather index fef9396..3c9946b 100755 --- a/winetest/gather +++ b/winetest/gather @@ -607,8 +607,8 @@ sub test_links($) my ($testname) = @_; my $source = $alltests{$testname}; return "<td class=\"links\"><a href=\"$gitweb/?a=history;f=$source;hb=$build\" title=\"$source change history\">history</a>" . - " | <a href=\"$gitweb/?a=blob;f=$source;hb=$build\" title=\"$source source code\">source</a>" . - " | <a href=\"../tests/$testname.html\" title=\"$testname results across all builds\">all builds</a></td>"; + " | <a href=\"$gitweb/?a=blob;f=$source;hb=$build\" title=\"$source source code\">source</a>" . + " | <a href=\"../tests/$testname.html\" title=\"$testname results across all builds\">all builds</a></td>"; } sub build_totals($)

1 0

Alexandre Julliard : git-to-cvs: Terminate as early as possible when there is nothing to do.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: tools Branch: master Commit: 26920a8b2902e6f74af07ffba7d9e0259b3ce13f URL: http://source.winehq.org/git/tools.git/?a=commit;h=26920a8b2902e6f74af07ffb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 6 17:50:07 2009 +0100 git-to-cvs: Terminate as early as possible when there is nothing to do. This reduces load when running out of a cron job. --- git-to-cvs | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/git-to-cvs b/git-to-cvs index 8bc6127..21da49f 100755 --- a/git-to-cvs +++ b/git-to-cvs @@ -346,17 +346,20 @@ sub apply_commits() my $base = shell_output "git", "merge-base", $last_commit, $branch; my $commit = shell_output "git", "rev-parse", "$last_commit^\{commit\}"; + my $tip = shell_output "git", "rev-parse", "$branch^\{commit\}"; die "$last_commit is not a parent of $branch" unless ($base eq $commit); + return if ($tip eq $base); + if (! -f $ENV{"GIT_INDEX_FILE"}) { # read the tree of the first commit and make sure we are up to date - shell "git-read-tree", "--reset", $last_commit; - shell "git-update-index", "--refresh"; - shell "git-checkout-index", "-q", "-f", "-u", "-a"; + shell "git", "read-tree", "--reset", $last_commit; + shell "git", "update-index", "--refresh"; + shell "git", "checkout-index", "-q", "-f", "-u", "-a"; } - open LIST, "-|" or exec "git", "rev-list", "$last_commit..$branch" or die "cannot run git rev-list"; + open LIST, "-|" or exec "git", "rev-list", "$base..$tip" or die "cannot run git rev-list"; while (<LIST>) { chomp; @@ -365,11 +368,10 @@ sub apply_commits() } close LIST; - unless (@commits) - { - print "No new commits to apply.\n"; - return; - } + return unless (@commits); + + read_tags(); + foreach my $commit (@commits) { apply_git_commit($commit); @@ -380,13 +382,11 @@ sub apply_commits() # build a list of all commits that are pointed to by a tag sub read_tags() { - open LIST, "-|" or exec "git", "for-each-ref", "refs/tags/wine*" or die "cannot run git for-each-ref"; + open LIST, "-|" or exec "git", "for-each-ref", "--format=%(object) %(refname)", "refs/tags/wine*" or die "cannot run git for-each-ref"; while (<LIST>) { - next unless /^[0-9a-f]{40} tag\trefs\/tags\/(.*)$/; - my $tag = $1; - my $commit = shell_output "git", "rev-parse", "$tag^{commit}"; - $tags{$commit} = $tag; + next unless /^([0-9a-f]{40}) refs\/tags\/(.*)$/; + $tags{$1} = $2; } close LIST; } @@ -403,5 +403,4 @@ $ENV{"GIT_INDEX_FILE"} = "CVS/.git-index"; -d $ENV{"GIT_DIR"} or die "Invalid git dir $ENV{GIT_DIR}"; -w "." or die "No write access to current directory"; -read_tags(); apply_commits();

1 0

Alexandre Julliard : winetest: Treat all dll load errors as a missing dll case.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: tools Branch: master Commit: c6ae8b593661931cd7ddbc05f401dd3d6a101846 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c6ae8b593661931cd7ddbc05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 8 20:06:07 2009 +0100 winetest: Treat all dll load errors as a missing dll case. --- winetest/dissect | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 5ef467c..d6daf39 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -210,10 +210,11 @@ while ($_ = <IN>) { chomp; s/\r+$//; last if (!/^\s+([^ =]+)=(.*)\r?$/); - $dllinfo{$1} = { version => $2 }; - if ($2 eq "dll is missing" || $2 eq "load error 1157") + my $module = $1; + $dllinfo{$module} = { version => $2 }; + if ($2 eq "dll is missing" || $2 =~ /^load error/) { - print SUM "- $1 - missing - - - - -\n"; + print SUM "- $module - missing - - - - -\n"; } }

1 0

Nikolay Sivov : gdiplus: Some tests for LinearGradientBrush.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 8496db4976a9e068361b8e4737d085fbe37b98e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8496db4976a9e068361b8e473… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Feb 9 16:58:59 2009 +0300 gdiplus: Some tests for LinearGradientBrush. --- dlls/gdiplus/tests/brush.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index ae83184..d2cbd3c 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -283,6 +283,67 @@ static void test_texturewrap(void) ReleaseDC(0, hdc); } +static void test_gradientgetrect(void) +{ + GpLineGradient *brush; + GpRectF rectf; + GpStatus status; + GpPointF pt1, pt2; + + pt1.X = pt1.Y = 1.0; + pt2.X = pt2.Y = 100.0; + status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush); + expect(Ok, status); + memset(&rectf, 0, sizeof(GpRectF)); + status = GdipGetLineRect(brush, &rectf); + expect(Ok, status); + expectf(1.0, rectf.X); + expectf(1.0, rectf.Y); + expectf(99.0, rectf.Width); + expectf(99.0, rectf.Height); + status = GdipDeleteBrush((GpBrush*)brush); + /* vertical gradient */ + pt1.X = pt1.Y = pt2.X = 0.0; + pt2.Y = 10.0; + status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush); + expect(Ok, status); + memset(&rectf, 0, sizeof(GpRectF)); + status = GdipGetLineRect(brush, &rectf); + expect(Ok, status); + todo_wine expectf(-5.0, rectf.X); + expectf(0.0, rectf.Y); + todo_wine expectf(10.0, rectf.Width); + expectf(10.0, rectf.Height); + status = GdipDeleteBrush((GpBrush*)brush); + /* horizontal gradient */ + pt1.X = pt1.Y = pt2.Y = 0.0; + pt2.X = 10.0; + status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush); + expect(Ok, status); + memset(&rectf, 0, sizeof(GpRectF)); + status = GdipGetLineRect(brush, &rectf); + expect(Ok, status); + expectf(0.0, rectf.X); + todo_wine expectf(-5.0, rectf.Y); + expectf(10.0, rectf.Width); + todo_wine expectf(10.0, rectf.Height); + status = GdipDeleteBrush((GpBrush*)brush); + /* from rect with LinearGradientModeHorizontal */ + rectf.X = rectf.Y = 10.0; + rectf.Width = rectf.Height = 100.0; + status = GdipCreateLineBrushFromRect(&rectf, 0, 0, LinearGradientModeHorizontal, + WrapModeTile, &brush); + expect(Ok, status); + memset(&rectf, 0, sizeof(GpRectF)); + status = GdipGetLineRect(brush, &rectf); + expect(Ok, status); + expectf(10.0, rectf.X); + expectf(10.0, rectf.Y); + expectf(100.0, rectf.Width); + expectf(100.0, rectf.Height); + status = GdipDeleteBrush((GpBrush*)brush); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -303,6 +364,7 @@ START_TEST(brush) test_getgamma(); test_transform(); test_texturewrap(); + test_gradientgetrect(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Pelletier : msadp32.acm: Make destination aligned on destination block size (copy/paste error).
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: e0aee93dc660cf6ec73d54acb95bd0341aa441fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0aee93dc660cf6ec73d54acb… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Wed Feb 4 21:11:05 2009 +0100 msadp32.acm: Make destination aligned on destination block size (copy/paste error). --- dlls/msadp32.acm/msadp32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index f345450..c3205e9 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -660,7 +660,7 @@ static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMS if (adss->cbSrcLength % (adsi->pwfxSrc->nBlockAlign * wSamplesPerBlock)) /* Round block count up. */ nblocks++; - adss->cbDstLength = nblocks * adsi->pwfxSrc->nBlockAlign; + adss->cbDstLength = nblocks * adsi->pwfxDst->nBlockAlign; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) @@ -672,7 +672,7 @@ static LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMS if (adss->cbSrcLength % adsi->pwfxSrc->nBlockAlign) /* Round block count up. */ nblocks++; - adss->cbDstLength = nblocks * adsi->pwfxSrc->nBlockAlign * wSamplesPerBlock; + adss->cbDstLength = nblocks * adsi->pwfxDst->nBlockAlign * wSamplesPerBlock; } else {

1 0

Alistair Leslie-Hughes : msxml3: Use our parent doc if we don't have one.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 17db41c3497f6e57e3ee8d001187354d2549c0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=17db41c3497f6e57e3ee8d001… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 5 20:43:59 2009 +1100 msxml3: Use our parent doc if we don't have one. --- dlls/msxml3/node.c | 5 +++++ dlls/msxml3/tests/domdoc.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7baef30..72cc61e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -387,6 +387,11 @@ static HRESULT get_node( if ( !out ) return E_INVALIDARG; + + /* if we dont have a doc, use our parent. */ + if(node && !node->doc && node->parent) + node->doc = node->parent->doc; + *out = create_node( node ); if (!*out) return S_FALSE; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 584eab3..c70e6ed 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2404,6 +2404,7 @@ static void test_cloneNode(void ) long nAttrCnt = 0, nAttrCnt1 = 0; IXMLDOMNode *node; IXMLDOMNode *node_clone; + IXMLDOMNode *node_first; HRESULT r; BSTR str; static const WCHAR szSearch[] = { 'l', 'c', '/', 'p', 'r', 0 }; @@ -2448,6 +2449,20 @@ static void test_cloneNode(void ) return; } + r = IXMLDOMNode_get_firstChild(node_clone, &node_first); + ok( r == S_OK, "ret %08x\n", r ); + if(r == S_OK) + { + IXMLDOMDocument *doc2; + + r = IXMLDOMNode_get_ownerDocument(node_clone, &doc2); + ok( r == S_OK, "ret %08x\n", r ); + if(r == S_OK) + IXMLDOMDocument_Release(doc2); + + IXMLDOMNode_Release(node_first); + } + r = IXMLDOMNode_get_childNodes(node, &pList); ok( r == S_OK, "ret %08x\n", r ); if (pList) @@ -2496,6 +2511,20 @@ static void test_cloneNode(void ) return; } + r = IXMLDOMNode_get_firstChild(node_clone, &node_first); + ok( r == S_FALSE, "ret %08x\n", r ); + if(r == S_OK) + { + IXMLDOMDocument *doc2; + + r = IXMLDOMNode_get_ownerDocument(node_clone, &doc2); + ok( r == S_OK, "ret %08x\n", r ); + if(r == S_OK) + IXMLDOMDocument_Release(doc2); + + IXMLDOMNode_Release(node_first); + } + r = IXMLDOMNode_get_childNodes(node_clone, &pList); ok( r == S_OK, "ret %08x\n", r ); if (pList)

1 0

Detlef Riekenberg : localspl: Move provider functions to a seperate file.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 51f078bd4af9532834666208ec41b4ba3631d8d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f078bd4af9532834666208e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Feb 8 16:38:30 2009 +0100 localspl: Move provider functions to a seperate file. --- dlls/localspl/Makefile.in | 3 +- dlls/localspl/localspl_main.c | 1303 +------------------------------------- dlls/localspl/localspl_private.h | 1 + dlls/localspl/provider.c | 1327 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 1333 insertions(+), 1301 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51f078bd4af9532834666…

1 0

Detlef Riekenberg : winspool: Move EnumPortsW to the backend.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 857e942992bea953ddffaf57d8a907a7d552748d URL: http://source.winehq.org/git/wine.git/?a=commit;h=857e942992bea953ddffaf57d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Feb 8 16:45:08 2009 +0100 winspool: Move EnumPortsW to the backend. --- dlls/localspl/provider.c | 229 +++++++++++++++++++++++++++++++++++++++++++++- dlls/winspool.drv/info.c | 212 +++---------------------------------------- 2 files changed, 241 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=857e942992bea953ddffa…

1 0

Detlef Riekenberg : spoolss: Implement EnumMonitors.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: c861e03866ee670a9ae99df6af4c774a1ff0c2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c861e03866ee670a9ae99df6a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Feb 8 16:49:38 2009 +0100 spoolss: Implement EnumMonitors. --- dlls/spoolss/router.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ dlls/spoolss/spoolss.spec | 2 +- 2 files changed, 64 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 0cd24a7..c3b9bb8 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -271,3 +271,66 @@ BOOL backend_load_all(void) return (pb != NULL); } + +/****************************************************************************** + * backend_first [internal] + * + * find the first usable backend + * + * RETURNS + * Success: PTR to the backend + * Failure: NULL + * + */ +static backend_t * backend_first(LPWSTR name) +{ + /* test for the local system first */ + if(!name || !name[0]) return backend[0]; + + FIXME("server %s not supported\n", debugstr_w(name)); + return NULL; +} + +/****************************************************************** + * EnumMonitorsW (spoolss.@) + * + * Enumerate available Port-Monitors + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level + * pMonitors [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pMonitors + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / required for pMonitors + * pcReturned [O] PTR to DWORD that receives the number of Monitors in pMonitors + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in pcbNeeded the Bytes required for pMonitors, if cbBuf is too small + * + */ +BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbBuf, + LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + backend_t * pb; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pMonitors, + cbBuf, pcbNeeded, pcReturned); + + if (pcbNeeded) *pcbNeeded = 0; + if (pcReturned) *pcReturned = 0; + + pb = backend_first(pName); + if (pb && pb->fpEnumMonitors) + res = pb->fpEnumMonitors(pName, Level, pMonitors, cbBuf, pcbNeeded, pcReturned); + else + { + SetLastError(ERROR_PROC_NOT_FOUND); + } + + TRACE("got %u with %u (%u byte for %u entries)\n\n", res, GetLastError(), + pcbNeeded ? *pcbNeeded : 0, pcReturned ? *pcReturned : 0); + + return (res == ROUTER_SUCCESS); +} diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index da5ee04..237bab1 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -45,7 +45,7 @@ @ stub EndPagePrinter @ stub EnumFormsW @ stub EnumJobsW -@ stub EnumMonitorsW +@ stdcall EnumMonitorsW(wstr long ptr long ptr ptr) @ stub EnumPerMachineConnectionsW @ stdcall EnumPortsW(wstr long ptr ptr ptr ptr) winspool.drv.EnumPortsW @ stub EnumPrintProcessorDatatypesW

1 0

David Hedberg : winecfg: Fix for paths containing utf-8.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 0b3064215b0f61dcc00a1a31bd81848b415fc1a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b3064215b0f61dcc00a1a31b… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Feb 7 00:37:32 2009 +0100 winecfg: Fix for paths containing utf-8. --- programs/winecfg/driveui.c | 62 +++++++++++++++++++++++++++++--------------- programs/winecfg/theme.c | 13 --------- programs/winecfg/winecfg.h | 13 +++++++++ 3 files changed, 54 insertions(+), 34 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index b9bcd2d..acad07a 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -86,34 +86,34 @@ static int lv_get_curr_select(HWND dialog) } /* sets the item in the listview at item->iIndex */ -static void lv_set_item(HWND dialog, LVITEM *item) +static void lv_set_item(HWND dialog, LVITEMW *item) { - SendDlgItemMessage(dialog, IDC_LIST_DRIVES, LVM_SETITEM, 0, (LPARAM) item); + SendDlgItemMessageW(dialog, IDC_LIST_DRIVES, LVM_SETITEMW, 0, (LPARAM) item); } /* sets specified item's text */ -static void lv_set_item_text(HWND dialog, int item, int subItem, char *text) +static void lv_set_item_text(HWND dialog, int item, int subItem, WCHAR *text) { - LVITEM lvItem; + LVITEMW lvItem; if (item < 0 || subItem < 0) return; lvItem.mask = LVIF_TEXT; lvItem.iItem = item; lvItem.iSubItem = subItem; lvItem.pszText = text; - lvItem.cchTextMax = lstrlen(lvItem.pszText); + lvItem.cchTextMax = lstrlenW(lvItem.pszText); lv_set_item(dialog, &lvItem); } /* inserts an item into the listview */ -static void lv_insert_item(HWND dialog, LVITEM *item) +static void lv_insert_item(HWND dialog, LVITEMW *item) { - SendDlgItemMessage(dialog, IDC_LIST_DRIVES, LVM_INSERTITEM, 0, (LPARAM) item); + SendDlgItemMessageW(dialog, IDC_LIST_DRIVES, LVM_INSERTITEMW, 0, (LPARAM) item); } /* retrieve the item at index item->iIndex */ -static void lv_get_item(HWND dialog, LVITEM *item) +static void lv_get_item(HWND dialog, LVITEMW *item) { - SendDlgItemMessage(dialog, IDC_LIST_DRIVES, LVM_GETITEM, 0, (LPARAM) item); + SendDlgItemMessageW(dialog, IDC_LIST_DRIVES, LVM_GETITEMW, 0, (LPARAM) item); } static void set_advanced(HWND dialog) @@ -235,7 +235,8 @@ static int fill_drives_list(HWND dialog) for(i = 0; i < 26; i++) { - LVITEM item; + LVITEMW item; + WCHAR *path; char letter[4]; /* skip over any unused drives */ @@ -252,12 +253,16 @@ static int fill_drives_list(HWND dialog) item.mask = LVIF_TEXT | LVIF_PARAM; item.iItem = count; item.iSubItem = 0; - item.pszText = letter; - item.cchTextMax = lstrlen(item.pszText); + item.pszText = strdupU2W(letter); + item.cchTextMax = lstrlenW(item.pszText); item.lParam = (LPARAM) &drives[i]; lv_insert_item(dialog, &item); - lv_set_item_text(dialog, count, 1, drives[i].unixpath); + HeapFree(GetProcessHeap(), 0, item.pszText); + + path = strdupU2W(drives[i].unixpath); + lv_set_item_text(dialog, count, 1, path); + HeapFree(GetProcessHeap(), 0, path); count++; } @@ -341,7 +346,7 @@ static void on_remove_click(HWND dialog) { int itemIndex; struct drive *drive; - LVITEM item; + LVITEMW item; itemIndex = lv_get_curr_select(dialog); if (itemIndex == -1) return; /* no selection */ @@ -379,12 +384,12 @@ static void on_remove_click(HWND dialog) static void update_controls(HWND dialog) { static const WCHAR emptyW[1]; - char *path; + WCHAR *path; unsigned int type; char serial[16]; const char *device; int i, selection = -1; - LVITEM item; + LVITEMW item; updating_ui = TRUE; @@ -406,9 +411,10 @@ static void update_controls(HWND dialog) WINE_TRACE("Updating sheet for drive %c\n", current_drive->letter); /* path */ - path = current_drive->unixpath; - WINE_TRACE("set path control text to '%s'\n", path); - set_text(dialog, IDC_EDIT_PATH, path); + WINE_TRACE("set path control text to '%s'\n", current_drive->unixpath); + path = strdupU2W(current_drive->unixpath); + set_textW(dialog, IDC_EDIT_PATH, path); + HeapFree(GetProcessHeap(), 0, path); /* drive type */ type = current_drive->type; @@ -498,9 +504,22 @@ static void on_edit_changed(HWND dialog, WORD id) case IDC_EDIT_PATH: { + WCHAR *wpath; char *path; + int lenW; + + wpath = get_textW(dialog, id); + if( (lenW = WideCharToMultiByte(CP_UNIXCP, 0, wpath, -1, NULL, 0, NULL, NULL)) ) + { + path = HeapAlloc(GetProcessHeap(), 0, lenW); + WideCharToMultiByte(CP_UNIXCP, 0, wpath, -1, path, lenW, NULL, NULL); + } + else + { + path = NULL; + wpath = strdupU2W("drive_c"); + } - path = get_text(dialog, id); HeapFree(GetProcessHeap(), 0, current_drive->unixpath); current_drive->unixpath = path ? path : strdupA("drive_c"); current_drive->modified = TRUE; @@ -508,7 +527,8 @@ static void on_edit_changed(HWND dialog, WORD id) WINE_TRACE("set path to %s\n", current_drive->unixpath); lv_set_item_text(dialog, lv_get_curr_select(dialog), 1, - current_drive->unixpath); + wpath); + HeapFree(GetProcessHeap(), 0, wpath); /* enable the apply button */ SendMessage(GetParent(dialog), PSM_CHANGED, (WPARAM) dialog, 0); diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 6b67b4e..537a113 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -732,19 +732,6 @@ static struct ShellFolderInfo *psfiSelected = NULL; #define NUM_ELEMS(x) (sizeof(x)/sizeof(*(x))) -/* create a unicode string from a string in Unix locale */ -static WCHAR *strdupU2W(const char *unix_str) -{ - WCHAR *unicode_str; - int lenW; - - lenW = MultiByteToWideChar(CP_UNIXCP, 0, unix_str, -1, NULL, 0); - unicode_str = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); - if (unicode_str) - MultiByteToWideChar(CP_UNIXCP, 0, unix_str, -1, unicode_str, lenW); - return unicode_str; -} - static void init_shell_folder_listview_headers(HWND dialog) { LVCOLUMN listColumn; RECT viewRect; diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index f929500..dcfb64d 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -135,6 +135,19 @@ static inline WCHAR *strdupW(const WCHAR *s) return lstrcpyW(r, s); } +/* create a unicode string from a string in Unix locale */ +static inline WCHAR *strdupU2W(const char *unix_str) +{ + WCHAR *unicode_str; + int lenW; + + lenW = MultiByteToWideChar(CP_UNIXCP, 0, unix_str, -1, NULL, 0); + unicode_str = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); + if (unicode_str) + MultiByteToWideChar(CP_UNIXCP, 0, unix_str, -1, unicode_str, lenW); + return unicode_str; +} + static inline char *get_text(HWND dialog, WORD id) { HWND item = GetDlgItem(dialog, id);

1 0