July 2007 - Wine-commits - list.winehq.org

Andrew Talbot : winedump: Cast-qual warnings fix.
by Alexandre Julliard 09 Jul '07

09 Jul '07

Module: wine Branch: master Commit: 82ee5a5812d39850eba31ac285654476ecfe166d URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ee5a5812d39850eba31ac28… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jul 7 17:21:00 2007 +0100 winedump: Cast-qual warnings fix. --- tools/winedump/lnk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index 661e48d..529e4ef 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -143,7 +143,7 @@ static int dump_pidl(void) while(sz<pidl->size) { - lnk_string *segment = (lnk_string*) &pidl->str.a[sz]; + const lnk_string *segment = (const lnk_string*) &pidl->str.a[sz]; if(!segment->size) break;

1 0

Andrew Talbot : winedump: Cast-qual warnings fix.
by Alexandre Julliard 09 Jul '07

09 Jul '07

Module: wine Branch: master Commit: 2d7cd213f2b0c132f5e7f8d3c500d99409323cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7cd213f2b0c132f5e7f8d3c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jul 7 17:21:07 2007 +0100 winedump: Cast-qual warnings fix. --- tools/winedump/pdb.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 78a2953..d4eb50b 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -61,11 +61,11 @@ struct pdb_reader const struct PDB_DS_TOC* toc; } ds; } u; - const void* (*read_file)(struct pdb_reader*, DWORD); + void* (*read_file)(struct pdb_reader*, DWORD); DWORD file_used[1024]; }; -static const void* pdb_jg_read(const struct PDB_JG_HEADER* pdb, const WORD* block_list, int size) +static void* pdb_jg_read(const struct PDB_JG_HEADER* pdb, const WORD* block_list, int size) { int i, nBlocks; BYTE* buffer; @@ -82,7 +82,7 @@ static const void* pdb_jg_read(const struct PDB_JG_HEADER* pdb, const WORD* bloc return buffer; } -static const void* pdb_jg_read_file(struct pdb_reader* reader, DWORD file_nr) +static void* pdb_jg_read_file(struct pdb_reader* reader, DWORD file_nr) { const WORD* block_list; DWORD i; @@ -132,7 +132,7 @@ static void pdb_exit(struct pdb_reader* reader) { #if 1 unsigned i; - const unsigned char*file; + unsigned char* file; DWORD size; for (i = 0; i < pdb_get_num_files(reader); i++) @@ -146,7 +146,7 @@ static void pdb_exit(struct pdb_reader* reader) printf("File --unused-- #%d (%x)\n", i, size); dump_data(file, size, " "); - free((char*)file); + free(file); } #endif if (reader->read_file == pdb_jg_read_file) @@ -157,9 +157,9 @@ static void pdb_exit(struct pdb_reader* reader) static void pdb_dump_symbols(struct pdb_reader* reader) { - const PDB_SYMBOLS* symbols; - const unsigned char*modimage; - const char* file; + PDB_SYMBOLS* symbols; + unsigned char* modimage; + const char* file; symbols = reader->read_file(reader, 3); @@ -290,7 +290,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader) { printf("\t------------globals-------------\n"); codeview_dump_symbols(modimage, pdb_get_file_size(reader, symbols->gsym_file)); - free((char*)modimage); + free(modimage); } /* Read per-module symbol / linenumber tables */ @@ -400,18 +400,18 @@ static void pdb_dump_symbols(struct pdb_reader* reader) /* what's that part ??? */ if (0) dump_data(modimage + symbol_size + lineno_size, total_size - (symbol_size + lineno_size), " "); - free((char*)modimage); + free(modimage); } file_name += strlen(file_name) + 1; file = (char*)((DWORD_PTR)(file_name + strlen(file_name) + 1 + 3) & ~3); } - free((char*)symbols); + free(symbols); } static void pdb_dump_types(struct pdb_reader* reader) { - const PDB_TYPES* types = NULL; + PDB_TYPES* types = NULL; types = reader->read_file(reader, 2); @@ -459,15 +459,15 @@ static void pdb_dump_types(struct pdb_reader* reader) types->unknown_offset, types->unknown_len); codeview_dump_types_from_block((const char*)types + types->type_offset, types->type_size); - free((char*)types); + free(types); } static const char pdb2[] = "Microsoft C/C++ program database 2.00"; static void pdb_jg_dump(void) { - struct pdb_reader reader; - const struct PDB_JG_ROOT* root = NULL; + struct pdb_reader reader; + struct PDB_JG_ROOT* root = NULL; /* * Read in TOC and well-known files @@ -511,7 +511,7 @@ static void pdb_jg_dump(void) default: printf("-Unknown root block version %d\n", root->Version); } - free((char*)root); + free(root); } else printf("-Unable to get root\n"); @@ -543,7 +543,7 @@ static void pdb_jg_dump(void) pdb_exit(&reader); } -static const void* pdb_ds_read(const struct PDB_DS_HEADER* header, const DWORD* block_list, int size) +static void* pdb_ds_read(const struct PDB_DS_HEADER* header, const DWORD* block_list, int size) { int i, nBlocks; BYTE* buffer; @@ -560,7 +560,7 @@ static const void* pdb_ds_read(const struct PDB_DS_HEADER* header, const DWORD* return buffer; } -static const void* pdb_ds_read_file(struct pdb_reader* reader, DWORD file_number) +static void* pdb_ds_read_file(struct pdb_reader* reader, DWORD file_number) { const DWORD* block_list; DWORD i; @@ -595,8 +595,8 @@ static const char pdb7[] = "Microsoft C/C++ MSF 7.00"; static void pdb_ds_dump(void) { - struct pdb_reader reader; - const struct PDB_DS_ROOT* root; + struct pdb_reader reader; + struct PDB_DS_ROOT* root; pdb_ds_init(&reader); printf("Header (DS)\n" @@ -640,7 +640,7 @@ static void pdb_ds_dump(void) for (ptr = &root->names[0]; ptr < &root->names[0] + root->cbNames; ptr += strlen(ptr) + 1) printf("\tString: %s\n", ptr); /* follows an unknown list of DWORDs */ - free((char*)root); + free(root); } else printf("-Unable to get root\n");

1 0

Thomas Weidenmueller : shell32: Set current directory when executing files in a shell view.
by Alexandre Julliard 09 Jul '07

09 Jul '07

Module: wine Branch: master Commit: 042bdefe5e07ef4f174fa23f43c6d338afc68b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042bdefe5e07ef4f174fa23f4… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Sat Jul 7 21:06:44 2007 +0200 shell32: Set current directory when executing files in a shell view. --- dlls/shell32/shlview.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 0efd18d..6dd27da 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -854,6 +854,9 @@ static HRESULT ShellView_OpenSelectedItems(IShellViewImpl * This) STGMEDIUM stgm; LPIDA pIDList; LPCITEMIDLIST parent_pidl; + WCHAR parent_path[MAX_PATH]; + LPCWSTR parent_dir = NULL; + SFGAOF attribs; int i; if (0 == ShellView_GetSelections(This)) @@ -887,10 +890,16 @@ static HRESULT ShellView_OpenSelectedItems(IShellViewImpl * This) pIDList = GlobalLock(stgm.u.hGlobal); parent_pidl = (LPCITEMIDLIST) ((LPBYTE)pIDList+pIDList->aoffset[0]); + hr = IShellFolder_GetAttributesOf(This->pSFParent, 1, &parent_pidl, &attribs); + if (SUCCEEDED(hr) && (attribs & SFGAO_FILESYSTEM) && + SHGetPathFromIDListW(parent_pidl, parent_path)) + { + parent_dir = parent_path; + } + for (i = pIDList->cidl; i > 0; --i) { LPCITEMIDLIST pidl; - SFGAOF attribs; pidl = (LPCITEMIDLIST)((LPBYTE)pIDList+pIDList->aoffset[i]); @@ -899,19 +908,19 @@ static HRESULT ShellView_OpenSelectedItems(IShellViewImpl * This) if (SUCCEEDED(hr) && ! (attribs & SFGAO_FOLDER)) { - SHELLEXECUTEINFOA shexinfo; + SHELLEXECUTEINFOW shexinfo; - shexinfo.cbSize = sizeof(SHELLEXECUTEINFOA); + shexinfo.cbSize = sizeof(SHELLEXECUTEINFOW); shexinfo.fMask = SEE_MASK_INVOKEIDLIST; /* SEE_MASK_IDLIST is also possible. */ shexinfo.hwnd = NULL; shexinfo.lpVerb = NULL; shexinfo.lpFile = NULL; shexinfo.lpParameters = NULL; - shexinfo.lpDirectory = NULL; + shexinfo.lpDirectory = parent_dir; shexinfo.nShow = SW_NORMAL; shexinfo.lpIDList = ILCombine(parent_pidl, pidl); - ShellExecuteExA(&shexinfo); /* Discard error/success info */ + ShellExecuteExW(&shexinfo); /* Discard error/success info */ ILFree((LPITEMIDLIST)shexinfo.lpIDList); }

1 0

Paul Vriens : kernel32/tests: Add a forgotten if statement.
by Alexandre Julliard 09 Jul '07

09 Jul '07

Module: wine Branch: master Commit: 7a6fbf2b09960542cde1f5eb28f969d22e5be479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a6fbf2b09960542cde1f5eb2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Jul 7 22:00:07 2007 +0200 kernel32/tests: Add a forgotten if statement. --- dlls/kernel32/tests/profile.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index b875134..8611c11 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -237,6 +237,7 @@ static void test_profile_sections_names(void) /* Test with sufficiently large buffer */ SetLastError(0xdeadbeef); ret = GetPrivateProfileSectionNamesW( bufW, 29, testfile3W ); + if (ret == 0 && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { skip("GetPrivateProfileSectionNamesW is not implemented\n"); DeleteFileA( testfile3 );

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 09 Jul '07

09 Jul '07

Module: wine Branch: master Commit: 382329c103f7f5c6cfbf3acdb4e8dfee58d6dbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=382329c103f7f5c6cfbf3acdb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 7 12:58:42 2007 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/d3d.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d628b98..6a062ca 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1035,11 +1035,11 @@ static void Direct3D1Test(void) {D3DCLIP_FRONT, {-1.0}, {-1.0}, {-1.0}}, {0, { 0.5}, { 0.5}, {0.5}}, {D3DCLIP_FRONT, {-0.5}, {-0.5}, {-0.5}}, {0, {-0.5}, {-0.5}, {0.0}} }; - ok(cmpH[i].hx == outH[i].hx && cmpH[i].hy == outH[i].hy && - cmpH[i].hz == outH[i].hz && cmpH[i].dwFlags == outH[i].dwFlags, + ok(U1(cmpH[i]).hx == U1(outH[i]).hx && U2(cmpH[i]).hy == U2(outH[i]).hy && + U3(cmpH[i]).hz == U3(outH[i]).hz && cmpH[i].dwFlags == outH[i].dwFlags, "HVertex %d differs. Got %08x %f %f %f, expexted %08x %f %f %f\n", i + 1, - outH[i].dwFlags, outH[i].hx, outH[i].hy, outH[i].hz, - cmpH[i].dwFlags, cmpH[i].hx, cmpH[i].hy, cmpH[i].hz); + outH[i].dwFlags, U1(outH[i]).hx, U2(outH[i]).hy, U3(outH[i]).hz, + cmpH[i].dwFlags, U1(cmpH[i]).hx, U2(cmpH[i]).hy, U3(cmpH[i]).hz); /* No scheme has been found behind those return values. It seems to be * whatever data windows has when throwing the vertex away. Modify the

1 0

Andrew Talbot : comdlg32: Cast-qual warning fix.
by Alexandre Julliard 09 Jul '07

09 Jul '07

Module: wine Branch: master Commit: 234b0d8c1e4770b956d5037f0f98d58bd32fb725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=234b0d8c1e4770b956d5037f0… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jul 7 17:20:48 2007 +0100 comdlg32: Cast-qual warning fix. --- dlls/comdlg32/fontdlg16.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/fontdlg16.c b/dlls/comdlg32/fontdlg16.c index 3580af5..9a85729 100644 --- a/dlls/comdlg32/fontdlg16.c +++ b/dlls/comdlg32/fontdlg16.c @@ -76,10 +76,12 @@ static void CFn_CHOOSEFONT16to32W(const CHOOSEFONT16 *chf16, LPCHOOSEFONTW chf32 int len; if (chf16->Flags & CF_ENABLETEMPLATE) { + LPWSTR name32w; + len = MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpTemplateName), -1, NULL, 0); - chf32w->lpTemplateName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpTemplateName), - -1, (LPWSTR)chf32w->lpTemplateName, len); + name32w = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpTemplateName), -1, name32w, len); + chf32w->lpTemplateName = name32w; } if (chf16->Flags & CF_USESTYLE) {

1 0

Andrew Talbot : ole32: Cast-qual warning fix.
by Alexandre Julliard 09 Jul '07

09 Jul '07

Module: wine Branch: master Commit: d4417c3c14d2c8283a7c3a6cc67a3d6eaa38d2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4417c3c14d2c8283a7c3a6cc… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jul 7 17:20:53 2007 +0100 ole32: Cast-qual warning fix. --- dlls/ole32/stubmanager.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 76e07a2..2243f33 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -364,7 +364,7 @@ HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, struct stub { /* FIXME: hack for IRemUnknown */ if (ipid->Data2 == 0xffff) - *stub_apt = apartment_findfromoxid(*(OXID *)ipid->Data4, TRUE); + *stub_apt = apartment_findfromoxid(*(const OXID *)ipid->Data4, TRUE); else *stub_apt = apartment_findfromtid(ipid->Data2); if (!*stub_apt)

1 0

appdb/include testData.php
by WineHQ 08 Jul '07

08 Jul '07

ChangeSet ID: 31242 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/08 12:37:34 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add 'delete' link to enable deleting testData Patch: http://cvs.winehq.org/patch.py?id=31242 Old revision New revision Changes Path 1.63 1.64 +4 -1 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.63 appdb/include/testData.php:1.64 --- appdb/include/testData.php:1.63 8 Jul 2007 17:37:34 -0000 +++ appdb/include/testData.php 8 Jul 2007 17:37:34 -0000 @@ -514,7 +514,10 @@ class testData{ $oObject = new objectManager("testData"); echo '<td><a href="'.$oObject->makeUrl("edit", $oTest->iTestingId, "Edit Test Results").'">',"\n"; - echo 'Edit</a></td>',"\n"; + echo 'Edit</a>   ',"\n"; + echo '<a href="objectManager.php?sClass=testData&bIsQueue=false&sAction='. + 'delete&iId='.$oTest->iTestingId.'&sTitle=Delete+Test+Results'. + '">Delete</a></td>',"\n"; } echo '</tr>',"\n"; }

1 0

appdb/. application.css
by WineHQ 07 Jul '07

07 Jul '07

ChangeSet ID: 31241 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/07 17:42:01 Modified files: . : application.css Log message: Loki Satyr <loki.satyr(a)gmail.com> CSS definitions for quoting code, terminal output, window output and registry changes Patch: http://cvs.winehq.org/patch.py?id=31241 Old revision New revision Changes Path 1.7 1.8 +30 -4 appdb/application.css Index: appdb/application.css diff -u -p appdb/application.css:1.7 appdb/application.css:1.8 --- appdb/application.css:1.7 7 Jul 2007 22:42: 1 -0000 +++ appdb/application.css 7 Jul 2007 22:42: 1 -0000 @@ -6,15 +6,40 @@ .subtitle { text-decoration: underline; font-style: italic; } -.code { font-family: monospace; font-size: 12px; } +/* Define <code> to behave like "generic" quoted software input and output. */ +.code { background-color: #efefef; padding: 0.5em; border-width: 1pt; + border-style: solid; border-color: #c0c0c0; white-space: -moz-pre-wrap; + font-family: monospace; } + +/* bash shell command prompt input and output */ +.quote_terminal { background-color: #f0ece6; padding: 0.5em; border-width: 1pt; + border-style: solid; border-color: #c0c0c0; white-space: -moz-pre-wrap; + font-family: monospace; } + +/* graphical user interface input and output */ +.quote_window { background-color: #c0e0f0; padding: 0.5em; border-width: 1pt; + border-style: solid; border-color: #c0c0c0; white-space: -moz-pre-wrap; + font-family: monospace; } + +/* + Wine registry modification. + Modifying the registry is a somewhat common wine task, and other How To's already + uniquely quote registry modifications, so here is a CSS to formalize this behavior. + In practice this tag is not necessary, since, like almost everything else, registry + edits are done either via a command prompt (regedit /C foo.reg (once implemented)) + or via the regedit graphical user interface. +*/ +.quote_registry { background-color: #c6ffc6; padding: 0.5em; border-width: 1pt; + border-style: solid; border-color: #c0c0c0; white-space: -moz-pre-wrap; + font-family: monospace; } p { font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; font-size: 12px; - } + } thead.historyHeader { font-weight: bold } -table.historyTable { border: 1px; +table.historyTable { border: 1px; font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; font-size: 12px; } @@ -35,4 +60,5 @@ tr.garbage { background-color: div.version_info_pane p { margin:0px; } div.info_container { margin:6px; border: 1px solid; } div.info_contents { padding:10px; background-color: #eee; } -div.title_class { font-weight: bold; border-bottom: 1px solid; padding: 4px; font-size: 140%; background-color: #ddd; } +div.title_class { font-weight: bold; border-bottom: 1px solid; padding: 4px; + font-size: 140%; background-color: #ddd; }

1 0

Stefan Dösinger : wined3d: Do not set streamIsUP in DrawPrimitiveStrided.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: 714e66acf25eaa30d779b5745a6117ee558ff6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=714e66acf25eaa30d779b5745… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 4 17:14:59 2007 +0200 wined3d: Do not set streamIsUP in DrawPrimitiveStrided. --- dlls/wined3d/device.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4749113..9d90df7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4741,7 +4741,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveStrided (IWineD3DDevice *i IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); This->stateBlock->baseVertexIndex = 0; This->up_strided = DrawPrimStrideData; - This->stateBlock->streamIsUP = TRUE; drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0, 0, 0, 0, NULL, 0); This->up_strided = NULL; return WINED3D_OK;

1 0