October 2006 - Wine-Commits

Michael Ploujnikov : psapi/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: cab43e6b6135a77370a27a4244d4a2190a6503ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab43e6b6135a77370a27a424… Author: Michael Ploujnikov <ploujj(a)gmail.com> Date: Tue Oct 10 18:00:25 2006 -0400 psapi/tests: Win64 printf format warning fixes. --- dlls/psapi/tests/Makefile.in | 1 - dlls/psapi/tests/psapi_main.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/psapi/tests/Makefile.in b/dlls/psapi/tests/Makefile.in index e7cf4ab..a02f807 100644 --- a/dlls/psapi/tests/Makefile.in +++ b/dlls/psapi/tests/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = psapi.dll IMPORTS = kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ psapi_main.c diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 63dbc0d..76db0de 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -42,7 +42,7 @@ #define w32_suc(x) \ ? (ok(1, "succeeded\n"), 1) \ : GetLastError() == 0xdeadbeef \ ? (ok(0, "failed without error code\n"), 0) \ - : (ok(0, "failed with %ld\n", GetLastError()), 0)) + : (ok(0, "failed with %d\n", GetLastError()), 0)) #define w32_err(x, e) \ (SetLastError(0xdeadbeef), \ @@ -52,7 +52,7 @@ #define w32_err(x, e) \ ? (ok(1, "failed with %d\n", e), 1) \ : GetLastError() == 0xdeadbeef \ ? (ok(0, "failed without error code\n"), 0) \ - : (ok(0, "expected error=%d but failed with %ld\n", \ + : (ok(0, "expected error=%d but failed with %d\n", \ e, GetLastError()), 0)) static BOOL (WINAPI *pEmptyWorkingSet)(HANDLE); @@ -95,9 +95,9 @@ static void test_EnumProcesses(void) DWORD pid, cbUsed = 0xdeadbeef; if(w32_suc(pEnumProcesses(NULL, 0, &cbUsed))) - ok(cbUsed == 0, "cbUsed=%ld\n", cbUsed); + ok(cbUsed == 0, "cbUsed=%d\n", cbUsed); if(w32_suc(pEnumProcesses(&pid, 4, &cbUsed))) - ok(cbUsed == 4, "cbUsed=%ld\n", cbUsed); + ok(cbUsed == 4, "cbUsed=%d\n", cbUsed); } static void test_EnumProcessModules(void) @@ -111,7 +111,7 @@ static void test_EnumProcessModules(void if(!w32_suc(pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded))) return; ok(cbNeeded / sizeof(HMODULE) >= 3 && cbNeeded / sizeof(HMODULE) <= 5 * sizeof(HMODULE), - "cbNeeded=%ld\n", cbNeeded); + "cbNeeded=%d\n", cbNeeded); ok(hMod == GetModuleHandle(NULL), "hMod=%p GetModuleHandle(NULL)=%p\n", hMod, GetModuleHandle(NULL)); } @@ -149,7 +149,7 @@ static void test_GetMappedFileName(void) w32_err(pGetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)), ERROR_ACCESS_DENIED); if(!w32_suc(ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath)))) return; - ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%ld\n", szMapPath, ret); + ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n", szMapPath, ret); ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath); szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */ if(!szMapBaseName || !*szMapBaseName) @@ -180,7 +180,7 @@ static void test_GetProcessImageFileName else if(GetLastError() == 0xdeadbeef) ok(0, "failed without error code\n"); else - ok(0, "failed with %ld\n", GetLastError()); + ok(0, "failed with %d\n", GetLastError()); return; } @@ -192,7 +192,7 @@ static void test_GetProcessImageFileName !w32_suc(pGetMappedFileNameA(hpQV, hMod, szMapPath, sizeof(szMapPath)))) return; /* Windows returns 2*strlen-1 */ - ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%ld\n", szImgPath, ret); + ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%d\n", szImgPath, ret); ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); } @@ -208,7 +208,7 @@ static void test_GetModuleFileNameEx(voi w32_err(pGetModuleFileNameExA(hpQV, hBad, szModExPath, sizeof(szModExPath)), ERROR_INVALID_HANDLE); if(!w32_suc(ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, sizeof(szModExPath)))) return; - ok(ret == strlen(szModExPath), "szModExPath=\"%s\" ret=%ld\n", szModExPath, ret); + ok(ret == strlen(szModExPath), "szModExPath=\"%s\" ret=%d\n", szModExPath, ret); GetModuleFileNameA(NULL, szModPath, sizeof(szModPath)); ok(!strncmp(szModExPath, szModPath, MAX_PATH), "szModExPath=\"%s\" szModPath=\"%s\"\n", szModExPath, szModPath); @@ -225,7 +225,7 @@ static void test_GetModuleBaseName(void) w32_err(pGetModuleBaseNameA(hpQV, hBad, szModBaseName, sizeof(szModBaseName)), ERROR_INVALID_HANDLE); if(!w32_suc(ret = pGetModuleBaseNameA(hpQV, NULL, szModBaseName, sizeof(szModBaseName)))) return; - ok(ret == strlen(szModBaseName), "szModBaseName=\"%s\" ret=%ld\n", szModBaseName, ret); + ok(ret == strlen(szModBaseName), "szModBaseName=\"%s\" ret=%d\n", szModBaseName, ret); GetModuleFileNameA(NULL, szModPath, sizeof(szModPath)); ok(!strcmp(strrchr(szModPath, '\\') + 1, szModBaseName), "szModPath=\"%s\" szModBaseName=\"%s\"\n", szModPath, szModBaseName); @@ -250,7 +250,7 @@ static void test_ws_functions(void) if(!VirtualLock(addr, 1)) { - trace("locking failed (error=%ld) - skipping test\n", GetLastError()); + trace("locking failed (error=%d) - skipping test\n", GetLastError()); goto free_page; }

1 0

Michael Ploujnikov : secur32/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: 4b7877d79d51efef888f0713f068974fcb7d8ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7877d79d51efef888f0713f… Author: Michael Ploujnikov <ploujj(a)gmail.com> Date: Tue Oct 10 17:47:35 2006 -0400 secur32/tests: Win64 printf format warning fixes. --- dlls/secur32/tests/Makefile.in | 1 - dlls/secur32/tests/main.c | 12 ++++---- dlls/secur32/tests/ntlm.c | 2 + dlls/secur32/tests/schannel.c | 60 ++++++++++++++++++++-------------------- dlls/secur32/tests/secur32.c | 4 +-- 5 files changed, 39 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b7877d79d51efef888f0…

1 0

H. Verbeet : regedit: Format warning fixes.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: b6a9109c03c5ce74a5cb0c1082fe7ce65f49bac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a9109c03c5ce74a5cb0c108… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Oct 10 23:01:21 2006 +0200 regedit: Format warning fixes. --- programs/regedit/regproc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index ff871d8..e93d4ff 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -170,7 +170,7 @@ DWORD convertHexToDWord(char *str, BYTE memcpy(xbuf,str,8); xbuf[8]='\0'; - sscanf(xbuf,"%08lx",&dw); + sscanf(xbuf,"%08x",&dw); memcpy(buf,&dw,sizeof(DWORD)); return sizeof(DWORD); } @@ -218,7 +218,7 @@ char* convertHexToDWORDStr(BYTE *buf, UL str = HeapAlloc(GetProcessHeap(), 0, (bufLen*2)+1); memcpy(&dw,buf,sizeof(DWORD)); - sprintf(str, "%08lx", dw); + sprintf(str, "%08x", dw); /* Get rid of the last comma */ return str; @@ -1057,7 +1057,7 @@ static void REGPROC_print_error(void) status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, (LPTSTR) &lpMsgBuf, 0, NULL); if (!status) { - fprintf(stderr,"%s: Cannot display message for error %ld, status %ld\n", + fprintf(stderr,"%s: Cannot display message for error %d, status %d\n", getAppName(), error_code, GetLastError()); exit(1); } @@ -1203,11 +1203,11 @@ static void export_hkey(FILE *file, HKEY break; case REG_DWORD: - fprintf(file, "dword:%08lx\n", *((DWORD *)*val_buf)); + fprintf(file, "dword:%08x\n", *((DWORD *)*val_buf)); break; default: - fprintf(stderr,"%s: warning - unsupported registry format '%ld', " + fprintf(stderr,"%s: warning - unsupported registry format '%d', " "treat as binary\n", getAppName(), value_type); fprintf(stderr,"key name: \"%s\"\n", *reg_key_name_buf); @@ -1225,7 +1225,7 @@ static void export_hkey(FILE *file, HKEY hex_prefix = "hex:"; } else { hex_prefix = buf; - sprintf(buf, "hex(%ld):", value_type); + sprintf(buf, "hex(%d):", value_type); } /* position of where the next character will be printed */

1 0

H. Verbeet : wordpad: Format warning fixes.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: 5aafea481a2398fe3462d994997b74fb15cca1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aafea481a2398fe3462d9949… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Oct 10 23:01:16 2006 +0200 wordpad: Format warning fixes. --- programs/wordpad/wordpad.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 7ca54e6..9afcc5d 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -137,7 +137,7 @@ static LRESULT OnCreate( HWND hWnd, WPAR 0, 0, 1000, 100, hWnd, (HMENU)IDC_EDITOR, hInstance, NULL); if (!hEditorWnd) { - fprintf(stderr, "Error code %lu\n", GetLastError()); + fprintf(stderr, "Error code %u\n", GetLastError()); return -1; } assert(hEditorWnd); @@ -189,7 +189,7 @@ static LRESULT OnNotify( HWND hWnd, WPAR SELCHANGE *pSC = (SELCHANGE *)lParam; char buf[128]; - sprintf( buf,"selection = %ld..%ld, line count=%ld\n", + sprintf( buf,"selection = %d..%d, line count=%ld\n", pSC->chrg.cpMin, pSC->chrg.cpMax, SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0)); SetWindowText(GetDlgItem(hWnd, IDC_STATUSBAR), buf); @@ -312,7 +312,7 @@ static LRESULT OnCommand( HWND hWnd, WPA SendMessage(hwndEditor, EM_EXGETSEL, 0, (LPARAM)&range); data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * (range.cpMax-range.cpMin+1)); SendMessage(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data); - sprintf(buf, "Start = %ld, End = %ld", range.cpMin, range.cpMax); + sprintf(buf, "Start = %d, End = %d", range.cpMin, range.cpMax); MessageBoxA(hWnd, buf, "Editor", MB_OK); MessageBoxW(hWnd, data, xszAppTitle, MB_OK); HeapFree( GetProcessHeap(), 0, data);

1 0

H. Verbeet : ddraw: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: 2465fcb3688d3e84f93a3c8184046704c2880fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=2465fcb3688d3e84f93a3c818… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Oct 10 19:23:27 2006 +0200 ddraw: Win64 printf format warning fixes. --- dlls/ddraw/Makefile.in | 1 dlls/ddraw/clipper.c | 12 +-- dlls/ddraw/ddraw.c | 50 ++++++------ dlls/ddraw/ddraw_thunks.c | 12 +-- dlls/ddraw/device.c | 184 ++++++++++++++++++++++---------------------- dlls/ddraw/direct3d.c | 16 ++-- dlls/ddraw/executebuffer.c | 36 ++++----- dlls/ddraw/gamma.c | 4 - dlls/ddraw/light.c | 6 + dlls/ddraw/main.c | 14 ++- dlls/ddraw/material.c | 8 +- dlls/ddraw/palette.c | 10 +- dlls/ddraw/parent.c | 4 - dlls/ddraw/surface.c | 56 +++++++------ dlls/ddraw/texture.c | 6 + dlls/ddraw/utils.c | 34 ++++---- dlls/ddraw/vertexbuffer.c | 22 +++-- dlls/ddraw/viewport.c | 28 +++---- 18 files changed, 251 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2465fcb3688d3e84f93a3…

1 0

H. Verbeet : d3d9: Disable the surface pitch size test for now, just check alignment instead.
by Alexandre Julliard Oct. 11, 2006

Oct. 11, 2006

Module: wine Branch: master Commit: 93ec41fd9a9a56e8c60b57e5c0f1fa6a1767cdd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ec41fd9a9a56e8c60b57e5c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Oct 10 19:53:42 2006 +0200 d3d9: Disable the surface pitch size test for now, just check alignment instead. --- dlls/d3d9/tests/surface.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 95e7311..b7a16a2 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -127,8 +127,13 @@ static void test_surface_alignment(IDire D3DLOCKED_RECT lockedRect; hr = IDirect3DSurface9_LockRect(surface_ptr, &lockedRect, NULL, 0); ok(hr == D3D_OK, "IDirect3DSurface9_LockRect returned %08x\n", hr); - /* test is deactivated until out np2 support doesn't report the full power of 2 pitch to the app */ - todo_wine ok(lockedRect.Pitch == 12, "Got pitch %d, expected 12\n", lockedRect.Pitch); + ok(!(lockedRect.Pitch & 3), "Surface pitch %d is not 32-bit aligned\n", lockedRect.Pitch); +#if 0 + /* Some applications also depend on the exact pitch, rather than just + * the alignment. However, this test will fail or succeed depending + * on the NP2 mode we're using. */ + ok(lockedRect.Pitch == 12, "Got pitch %d, expected 12\n", lockedRect.Pitch); +#endif hr = IDirect3DSurface9_UnlockRect(surface_ptr); IDirect3DSurface9_Release(surface_ptr); }

1 0

lostwages/wwn wn20040709_230.xml wn20040827_23 ...
by Jeremy Newman Oct. 10, 2006

Oct. 10, 2006

ChangeSet ID: 28815 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/10/10 15:06:19 Modified files: wwn : wn20040709_230.xml wn20040827_237.xml wn20060428_312.xml Log message: Tom Wickline <twickline(a)gmail.com> fix a couple named anchors Patch: http://cvs.winehq.org/patch.py?id=28815 Old revision New revision Changes Path 1.2 1.3 +4 -4 lostwages/wwn/wn20040709_230.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20040827_237.xml 1.2 1.3 +3 -3 lostwages/wwn/wn20060428_312.xml Index: lostwages/wwn/wn20040709_230.xml diff -u -p lostwages/wwn/wn20040709_230.xml:1.2 lostwages/wwn/wn20040709_230.xml:1.3 --- lostwages/wwn/wn20040709_230.xml:1.2 10 Oct 2006 20: 6:19 -0000 +++ lostwages/wwn/wn20040709_230.xml 10 Oct 2006 20: 6:19 -0000 @@ -65,10 +65,10 @@ Its main goal is to experience a slow ha <p>We've talked a few times about Mono using Wine for it's System.Windows.Forms implementation. For the timeline of events, see issues - <a href="http://www.winehq.com/?issue=162#.NET%20Success">#162</a>, - <a href="http://www.winehq.com/?issue=171#Making%20Mono's%20Winforms%20Work">#171</a>, - <a href="http://www.winehq.com/?issue=213#Wine%20As%20A%20Shared%20Library%20&%2…">#213</a> and - <a href="http://www.winehq.com/?issue=214#Wine%20As%20A%20Shared%20Library%20&%2…'t)">#214</a>. + <a href="{$root}/site/?issue=162#.NET%20Success">#162</a>, + <a href="{$root}/site/?issue=171#Making%20Mono's%20Winforms%20Work">#171</a>, + <a href="{$root}/site/?issue=213#Wine%20As%20A%20Shared%20Library%20&%20Mono">#213</a> and + <a href="{$root}/site/?issue=214#Wine%20As%20A%20Shared%20Library%20&%20Mono%20(con't)">#214</a>. Last week Miguel de Icaza announced on the <a href="http://lists.ximian.com/archives/public/mono-devel-list/">Mono development list</a> plans to abandon using Wine on the backend:</p> Index: lostwages/wwn/wn20040827_237.xml diff -u -p lostwages/wwn/wn20040827_237.xml:1.3 lostwages/wwn/wn20040827_237.xml:1.4 --- lostwages/wwn/wn20040827_237.xml:1.3 10 Oct 2006 20: 6:19 -0000 +++ lostwages/wwn/wn20040827_237.xml 10 Oct 2006 20: 6:19 -0000 @@ -367,7 +367,7 @@ of place. Currently Wine supports two m is for graphical apps using X (x11drv) and the other is for commandline apps (ttydrv.) There have been efforts in the past to add others, such as the SDL driver (see WWN issue -<a href="http://www.winehq.com/?issue=114#New%20SDL%20Driver">#114</a>), +<a href="{$root}/site/?issue=114#New%20SDL%20Driver">#114</a>), but there hasn't been much of a reason. Rib explained that there's still much work to do in order for the driver to be functional:</p> <quote who="Rib Rdb"><p> Index: lostwages/wwn/wn20060428_312.xml diff -u -p lostwages/wwn/wn20060428_312.xml:1.2 lostwages/wwn/wn20060428_312.xml:1.3 --- lostwages/wwn/wn20060428_312.xml:1.2 10 Oct 2006 20: 6:19 -0000 +++ lostwages/wwn/wn20060428_312.xml 10 Oct 2006 20: 6:19 -0000 @@ -434,9 +434,9 @@ engine would also make games perform bet are done with 3D and work on other areas of Wine will improve that performance. </p> <p>For background on this topic, check out WWN -<a href="http://www.winehq.com/?issue=131#DIB%20Engine%20Update">#119</a> -<a href="http://www.winehq.com/?issue=138#DIB%20Engine%20(cont'd)">#138</a> and -<a href="http://www.winehq.com/?issue=159#X11Drv%20/%20NTDll%20Separation">#159</a>. </p> +<a href="{$root}/site/?issue=131#DIB%20Engine%20Update">#131</a> +<a href="{$root}/site/?issue=138#DIB%20Engine%20(cont'd)">#138</a> and +<a href="{$root}/site/?issue=159#X11Drv%20/%20NTDll%20Separation">#159</a>. </p> <p>So Jesse Allen asked about the DIB engine, <quote who="Jesse Allen">

1 0

lostwages/templates/en status.template status_ ...
by Jeremy Newman Oct. 10, 2006

Oct. 10, 2006

ChangeSet ID: 28814 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/10/10 15:02:26 Modified files: templates/en : status.template status_changelog.template status_dlls.template status_ui.template Log message: Tom Wickline <twickline(a)gmail.com> status updates, please see status_changelog for a full changelog. Patch: http://cvs.winehq.org/patch.py?id=28814 Old revision New revision Changes Path 1.47 1.48 +1 -1 lostwages/templates/en/status.template 1.51 1.52 +12 -0 lostwages/templates/en/status_changelog.template 1.43 1.44 +4 -4 lostwages/templates/en/status_dlls.template 1.24 1.25 +2 -2 lostwages/templates/en/status_ui.template Index: lostwages/templates/en/status.template diff -u -p lostwages/templates/en/status.template:1.47 lostwages/templates/en/status.template:1.48 --- lostwages/templates/en/status.template:1.47 10 Oct 2006 20: 2:26 -0000 +++ lostwages/templates/en/status.template 10 Oct 2006 20: 2:26 -0000 @@ -8,7 +8,7 @@ <h1>Wine Status</h1> - <p>Last update: September 25, 2006.</p> + <p>Last update: October 1, 2006.</p> <div align=center> <table width="90%" border="0" cellspacing="0" cellpadding="2"> Index: lostwages/templates/en/status_changelog.template diff -u -p lostwages/templates/en/status_changelog.template:1.51 lostwages/templates/en/status_changelog.template:1.52 --- lostwages/templates/en/status_changelog.template:1.51 10 Oct 2006 20: 2:26 -0000 +++ lostwages/templates/en/status_changelog.template 10 Oct 2006 20: 2:26 -0000 @@ -2,6 +2,18 @@ <h1>Wine Status - ChangeLog</h1> +<p>Changes since October 1, 2006:</p> + + <ul> + <li>ADD - Paul Vriens as worker to wintrust.dll</li> + <li>ADD - Mikołaj Zalewski as worker to comctl32.dll</li> + <li>Remove - Thomas Weidenmüller as worker on comctl32.dll</li> + <li>Remove - Phil Krylov as worker on comctl32.dll</li> + <li>version.dll 85% -> 95%</li> + <li>wintrust.dll 5% -> 10%</li> + </ul> + <br> + <p>Changes since September 25, 2006:</p> <ul> Index: lostwages/templates/en/status_dlls.template diff -u -p lostwages/templates/en/status_dlls.template:1.43 lostwages/templates/en/status_dlls.template:1.44 --- lostwages/templates/en/status_dlls.template:1.43 10 Oct 2006 20: 2:26 -0000 +++ lostwages/templates/en/status_dlls.template 10 Oct 2006 20: 2:26 -0000 @@ -95,7 +95,7 @@ <a href="{$root}/site/?issue=267#Theming%20Revisited">#267</a>, <a href="{$root}/site/?issue=288#Comctl32%20Fixes">#288</a></td> <td class="pct95">95% complete</td> - <td>Thomas Weidenmüller,<br>Phil Krylov</td> + <td>Mikołaj Zalewski</td> </tr> <tr> <td>comdlg32.dll</td> @@ -787,7 +787,7 @@ <td>version.dll</td> <td class="adequate"><a href="http://www.andreavb.com/API_VERSION.html">version API calls</a></td> <td>None</td> - <td class="pct85">85% complete</td> + <td class="pct95">95% complete</td> <td></td> </tr> <tr> @@ -863,8 +863,8 @@ <td>wintrust.dll</td> <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/security/s…">MSDN: Cryptography Functions</a></td> <td>None</td> - <td class="pct5">5% complete</td> - <td></td> + <td class="pct10">10% complete</td> + <td>Paul Vriens</td> </tr> <tr> <td>wldap32.dll</td> Index: lostwages/templates/en/status_ui.template diff -u -p lostwages/templates/en/status_ui.template:1.24 lostwages/templates/en/status_ui.template:1.25 --- lostwages/templates/en/status_ui.template:1.24 10 Oct 2006 20: 2:26 -0000 +++ lostwages/templates/en/status_ui.template 10 Oct 2006 20: 2:26 -0000 @@ -187,7 +187,7 @@ <a class="srclink" href="http://source.winehq.org/source/dlls/comctl32/header.c">LXR</a></td> <td class="needed"></td> <td class="needed"></td> - <td class="pct60">60%: Unicodification, drag & drop, new messages, notifications, bugs.</td> + <td class="pct95">95%: filters support</td> </tr> <tr> @@ -205,7 +205,7 @@ <a class="srclink" href="http://source.winehq.org/source/dlls/comctl32/imagelist.c">LXR</a></td> <td>Sep 12, 2002</td> <td>Comctl32.dll 6.0</td> - <td class="pct85">85%: Fix hotspot handling, implement the ILD_*, and ILS_* styles</td> + <td class="pct85">85%: implement the ILD_*, and ILS_* styles</td> </tr> <tr>

1 0

Saulius Krasuckas : lz32/tests: WinME sometimes returns short filenames.
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: e05035da18267b46eb69e704ae29eda33e26f4f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05035da18267b46eb69e704a… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Tue Oct 10 19:38:13 2006 +0300 lz32/tests: WinME sometimes returns short filenames. --- dlls/lz32/tests/lzexpand_main.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 613317f..6c5f150 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -353,6 +353,7 @@ static void test_LZOpenFileA(void) INT file; static char badfilename_[] = "badfilename_"; char expected[MAX_PATH]; + char short_expected[MAX_PATH]; SetLastError(0xfaceabee); /* Check for nonexistent file. */ @@ -384,6 +385,7 @@ static void test_LZOpenFileA(void) /* Check various opening options: */ memset(&test, 0xA5, sizeof(test)); + full_file_path_name_in_a_CWD(filename_, short_expected, TRUE); /* a, for reading. */ file = LZOpenFileA(filename_, &test, OF_READ); @@ -392,9 +394,10 @@ static void test_LZOpenFileA(void) "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, expected); + ok(lstrcmpA(test.szPathName, expected) == 0 || + lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", + test.szPathName, expected, short_expected); LZClose(file); memset(&test, 0xA5, sizeof(test)); @@ -406,9 +409,10 @@ static void test_LZOpenFileA(void) "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, expected); + ok(lstrcmpA(test.szPathName, expected) == 0 || + lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", + test.szPathName, expected, short_expected); LZClose(file); memset(&test, 0xA5, sizeof(test)); @@ -420,9 +424,10 @@ static void test_LZOpenFileA(void) "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, expected); + ok(lstrcmpA(test.szPathName, expected) == 0 || + lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", + test.szPathName, expected, short_expected); LZClose(file); memset(&test, 0xA5, sizeof(test)); @@ -434,9 +439,10 @@ static void test_LZOpenFileA(void) "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, expected); + ok(lstrcmpA(test.szPathName, expected) == 0 || + lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", + test.szPathName, expected, short_expected); LZClose(file); memset(&test, 0xA5, sizeof(test)); @@ -448,9 +454,10 @@ static void test_LZOpenFileA(void) "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, expected); + ok(lstrcmpA(test.szPathName, expected) == 0 || + lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", + test.szPathName, expected, short_expected); LZClose(file); retval = GetFileAttributesA(filename_);

1 0

Saulius Krasuckas : lz32/tests: Be more verbose and aware of root directory .
by Alexandre Julliard Oct. 10, 2006

Oct. 10, 2006

Module: wine Branch: master Commit: f29042b3a670aad22c139d858538f6f4c9827ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f29042b3a670aad22c139d858… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Tue Oct 10 19:36:56 2006 +0300 lz32/tests: Be more verbose and aware of root directory. --- dlls/lz32/tests/lzexpand_main.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 593d98b..613317f 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -77,14 +77,18 @@ static void full_file_path_name_in_a_CWD char shortname[MAX_PATH]; retval = GetCurrentDirectoryA(MAX_PATH, dst); - ok(retval > 0, "GetCurrentDirectoryA returned %ld, GLE=0x%lx\n", + ok(retval > 0, "GetCurrentDirectoryA returned %ld, GLE=%ld\n", retval, GetLastError()); - lstrcatA(dst, "\\"); + if(dst[retval-1] != '\\') + /* Append backslash only when it's missing */ + lstrcatA(dst, "\\"); lstrcatA(dst, src); if(expect_short) { memcpy(shortname, dst, MAX_PATH); - GetShortPathName(shortname, dst, MAX_PATH-1); + retval = GetShortPathName(shortname, dst, MAX_PATH-1); + ok(retval > 0, "GetShortPathName returned %ld for '%s', GLE=%ld\n", + retval, dst, GetLastError()); } } @@ -95,7 +99,7 @@ static void create_file(char *fname) DWORD retval; file = LZOpenFileA(fname, &ofs, OF_CREATE); - ok(file >= 0, "LZOpenFileA failed on creation\n"); + ok(file >= 0, "LZOpenFileA failed to create '%s'\n", fname); LZClose(file); retval = GetFileAttributesA(fname); ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA('%s'): error %ld\n", ofs.szPathName, GetLastError()); @@ -108,7 +112,7 @@ static void delete_file(char *fname) DWORD retval; file = LZOpenFileA(fname, &ofs, OF_DELETE); - ok(file >= 0, "LZOpenFileA failed on delete\n"); + ok(file >= 0, "LZOpenFileA failed to delete '%s'\n", fname); LZClose(file); retval = GetFileAttributesA(fname); ok(retval == INVALID_FILE_ATTRIBUTES, "GetFileAttributesA succeeded on deleted file ('%s')\n", ofs.szPathName);

1 0