January 2009 - Wine-Commits

Rince : Fix 404s in winelib guide
by Jeremy Newman Jan. 29, 2009

Jan. 29, 2009

Module: website Branch: master Commit: 8c52388cabd6e9d172455ccb77d3bec05974afaf URL: http://source.winehq.org/git/website.git/?a=commit;h=8c52388cabd6e9d172455c… Author: Rince <rercola(a)acm.jhu.edu> Date: Fri Jan 23 16:35:27 2009 -0500 Fix 404s in winelib guide --0015175cba90e4972104612d2aac Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Attached patch fixes several 404s in the winelib guide (several links on /winelib pointed at site/docs/winelib-guide, which 404s, instead of /site/docs/winelib-guide/index). - Rich Attached patch fixes several 404s in the winelib guide (several links on /winelib pointed at site/docs/winelib-guide, which 404s, instead of /site/docs/winelib-guide/index).<br><br>- Rich<br> --- templates/en/winelib.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/winelib.template b/templates/en/winelib.template index c07d8c6..0d50575 100644 --- a/templates/en/winelib.template +++ b/templates/en/winelib.template @@ -10,7 +10,7 @@ Theoretically, any Win32 app should be compilable out of the box under Wine. This, of course, is not the case. We have incompatible headers, and a bunch of other problems described in - <a href="http://www.winehq.org/site/docs/winelib-guide/">Winelib User's Guide</a>. + <a href="http://www.winehq.org/site/docs/winelib-guide/index">Winelib User's Guide</a>. A good way to fix these is to try to compile applications for which we have the source under Winelib. @@ -19,7 +19,7 @@ <ul> <li>Document our experience on porting these applications to Winelib <li>Improve Winelib based on the above such that the porting process becomes very simple - <li>Update the <a href="http://www.winehq.org/site/docs/winelib-guide/">Winelib User's Guide</a> + <li>Update the <a href="http://www.winehq.org/site/docs/winelib-guide/index">Winelib User's Guide</a> to the latest porting process <li>Fixing header & library problems in the process. </ul>

1 0

Ge van Geldorp : ole32/tests: Write to HKCR instead of HKCU/Software/ Classes for the benefit of older Windows versions.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 4b27dfec939d131c9d7e09f97f14dfc7dabe8843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b27dfec939d131c9d7e09f97… Author: Ge van Geldorp <ge(a)gse.nl> Date: Thu Jan 29 15:33:02 2009 +0100 ole32/tests: Write to HKCR instead of HKCU/Software/Classes for the benefit of older Windows versions. --- dlls/ole32/tests/marshal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index ff72647..73d6a08 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2246,13 +2246,13 @@ static void reg_unreg_wine_test_class(BOOL Register) hr = StringFromCLSID(&CLSID_WineTest, &pszClsid); ok_ole_success(hr, "StringFromCLSID"); - strcpy(buffer, "Software\\Classes\\CLSID\\"); + strcpy(buffer, "CLSID\\"); WideCharToMultiByte(CP_ACP, 0, pszClsid, -1, buffer + strlen(buffer), sizeof(buffer) - strlen(buffer), NULL, NULL); CoTaskMemFree(pszClsid); strcat(buffer, "\\InprocHandler32"); if (Register) { - error = RegCreateKeyEx(HKEY_CURRENT_USER, buffer, 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey, &dwDisposition); + error = RegCreateKeyEx(HKEY_CLASSES_ROOT, buffer, 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey, &dwDisposition); ok(error == ERROR_SUCCESS, "RegCreateKeyEx failed with error %d\n", error); error = RegSetValueEx(hkey, NULL, 0, REG_SZ, (const unsigned char *)"ole32.dll", strlen("ole32.dll") + 1); ok(error == ERROR_SUCCESS, "RegSetValueEx failed with error %d\n", error); @@ -2260,9 +2260,9 @@ static void reg_unreg_wine_test_class(BOOL Register) } else { - RegDeleteKey(HKEY_CURRENT_USER, buffer); + RegDeleteKey(HKEY_CLASSES_ROOT, buffer); *strrchr(buffer, '\\') = '\0'; - RegDeleteKey(HKEY_CURRENT_USER, buffer); + RegDeleteKey(HKEY_CLASSES_ROOT, buffer); } }

1 0

Hans Leidekker : wininet: Make sure redirected POST requests become GET requests.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: aac2e8dd19c0e1c36c3d3a666075993a51959b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac2e8dd19c0e1c36c3d3a666… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 29 14:33:09 2009 +0100 wininet: Make sure redirected POST requests become GET requests. --- dlls/wininet/http.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ac42f96..5bf3388 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3467,6 +3467,10 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, if ((dwStatusCode==HTTP_STATUS_REDIRECT || dwStatusCode==HTTP_STATUS_MOVED) && HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) { + /* redirects are always GETs */ + HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb); + lpwhr->lpszVerb = WININET_strdupW(szGET); + HTTP_DrainContent(lpwhr); INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_REDIRECT, szNewLocation,

1 0

Hans Leidekker : wininet: Add a stub implementation of GetDiskInfoA.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: cd38e554b6de0a9ad4e3ff89eccf92f87ffc20d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd38e554b6de0a9ad4e3ff89e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 29 14:32:50 2009 +0100 wininet: Add a stub implementation of GetDiskInfoA. --- dlls/wininet/urlcache.c | 9 +++++++++ dlls/wininet/wininet.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 11361d0..c22883d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3617,3 +3617,12 @@ BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLa return TRUE; } + +/*********************************************************************** + * GetDiskInfoA (WININET.@) + */ +DWORD WINAPI GetDiskInfoA(void *p0, void *p1, void *p2, void *p3) +{ + FIXME("(%p, %p, %p, %p)\n", p0, p1, p2, p3); + return 0; +} diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index dfbc38c..f5b616e 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -1,5 +1,5 @@ 101 stub -noname DoConnectoidsExist -102 stub -noname GetDiskInfoA +102 stdcall -noname GetDiskInfoA(ptr ptr ptr ptr) 103 stub -noname PerformOperationOverUrlCacheA 104 stub -noname HttpCheckDavComplianceA 105 stub -noname HttpCheckDavComplianceW

1 0

Hans Leidekker : wininet: Return success from per connection option stubs. Fully initialize the value.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: e1b916c1428647ca0c41b755856e520877cc5f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b916c1428647ca0c41b7558… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 29 14:32:16 2009 +0100 wininet: Return success from per connection option stubs. Fully initialize the value. --- dlls/wininet/internet.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6f67c3d..363f7a4 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2154,8 +2154,7 @@ DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: FIXME("Unhandled dwOption %d\n", option->dwOption); - option->Value.dwValue = 0; - res = ERROR_INVALID_PARAMETER; + memset(&option->Value, 0, sizeof(option->Value)); break; default:

1 0

Andrey Turkin : programs: Add lodctr and unlodctr tools.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 347272b37e81aee143e274089f114411d4c95ad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=347272b37e81aee143e274089… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed Jan 28 19:56:25 2009 +0300 programs: Add lodctr and unlodctr tools. --- .gitignore | 2 ++ configure | 20 ++++++++++++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 5 +++++ dlls/loadperf/Makefile.in | 1 + programs/lodctr/Makefile.in | 13 +++++++++++++ programs/lodctr/lodctr_main.c | 25 +++++++++++++++++++++++++ programs/unlodctr/Makefile.in | 13 +++++++++++++ programs/unlodctr/unlodctr_main.c | 25 +++++++++++++++++++++++++ 9 files changed, 106 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=347272b37e81aee143e27…

1 0

Dan Kegel : winedos: Get File Attributes must fail for files with names ending in slash.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: d71a60378df9d2cd89c19d3231e8f4c40a94c953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71a60378df9d2cd89c19d323… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Jan 28 23:32:18 2009 -0800 winedos: Get File Attributes must fail for files with names ending in slash. --- dlls/winedos/int21.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index b8a1163..140885c 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -2028,12 +2028,19 @@ static BOOL INT21_FileAttributes( CONTEXT86 *context, FILETIME filetime; DWORD result; WORD date, time; + int len; switch (subfunction) { case 0x00: /* GET FILE ATTRIBUTES */ TRACE( "GET FILE ATTRIBUTES for %s\n", fileA ); - MultiByteToWideChar(CP_OEMCP, 0, fileA, -1, fileW, MAX_PATH); + len = MultiByteToWideChar(CP_OEMCP, 0, fileA, -1, fileW, MAX_PATH); + + /* Winbench 96 Disk Test fails if we don't complain + * about a filename that ends in \ + */ + if (!len || (fileW[len-1] == '/') || (fileW[len-1] == '\\')) + return FALSE; result = GetFileAttributesW( fileW ); if (result == INVALID_FILE_ATTRIBUTES)

1 0

Andrey Turkin : loadperf: Rename argument to match its function.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: a9c5793d3f3b11cb4057b4db5d3b8a9759a1da9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c5793d3f3b11cb4057b4db5… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed Jan 28 19:56:25 2009 +0300 loadperf: Rename argument to match its function. --- dlls/loadperf/loadperf_main.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/loadperf/loadperf_main.c b/dlls/loadperf/loadperf_main.c index 54fe2d6..35ce891 100644 --- a/dlls/loadperf/loadperf_main.c +++ b/dlls/loadperf/loadperf_main.c @@ -135,14 +135,14 @@ DWORD WINAPI LoadPerfCounterTextStringsW(LPCWSTR cmdline, BOOL quiet) * NOTES * See UnloadPerfCounterTextStringsW */ -DWORD WINAPI UnloadPerfCounterTextStringsA(LPCSTR cmdline, BOOL verbose) +DWORD WINAPI UnloadPerfCounterTextStringsA(LPCSTR cmdline, BOOL quiet) { DWORD ret; LPWSTR cmdlineW = NULL; if (cmdline && !(cmdlineW = strdupAW(cmdline))) return ERROR_OUTOFMEMORY; - ret = UnloadPerfCounterTextStringsW(cmdlineW, verbose); + ret = UnloadPerfCounterTextStringsW(cmdlineW, quiet); HeapFree(GetProcessHeap(), 0, cmdlineW); @@ -154,12 +154,12 @@ DWORD WINAPI UnloadPerfCounterTextStringsA(LPCSTR cmdline, BOOL verbose) * * PARAMS * cmdline [in] Last argument in command line - application counters to be removed - * verbose [in] TRUE - the function may write to stdout + * quiet [in] FALSE - the function may write to stdout * */ -DWORD WINAPI UnloadPerfCounterTextStringsW(LPCWSTR cmdline, BOOL verbose) +DWORD WINAPI UnloadPerfCounterTextStringsW(LPCWSTR cmdline, BOOL quiet) { - FIXME("(%s, %d): stub\n", debugstr_w(cmdline), verbose); + FIXME("(%s, %d): stub\n", debugstr_w(cmdline), quiet); return ERROR_SUCCESS; }

1 0

Diaa Sami : shell32: Include the text control when resizing ShBrowseForFolder dialog.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: cdb0497d7aad1cd03c09f4c891fc10e1e2ac6e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb0497d7aad1cd03c09f4c89… Author: Diaa Sami <diaasami(a)gmail.com> Date: Wed Jan 28 21:54:30 2009 +0200 shell32: Include the text control when resizing ShBrowseForFolder dialog. --- dlls/shell32/brsfolder.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 48bb943..70dcc47 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -75,6 +75,7 @@ static const LAYOUT_INFO g_layout_info[] = {IDD_STATUS, BF_TOP|BF_LEFT|BF_RIGHT}, {IDD_FOLDER, BF_TOP|BF_LEFT|BF_RIGHT}, {IDD_TREEVIEW, BF_TOP|BF_BOTTOM|BF_LEFT|BF_RIGHT}, + {IDD_FOLDER, BF_BOTTOM|BF_LEFT}, {IDD_FOLDERTEXT, BF_BOTTOM|BF_LEFT|BF_RIGHT}, {IDD_MAKENEWFOLDER, BF_BOTTOM|BF_LEFT}, {IDOK, BF_BOTTOM|BF_RIGHT},

1 0

Paul Vriens : crypt32: Fix CertDuplicateCertificateContext for a passed NULL context.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 8218518695ed8378aed4dd08953f708b9e29b06d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8218518695ed8378aed4dd089… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 29 13:32:59 2009 +0100 crypt32: Fix CertDuplicateCertificateContext for a passed NULL context. --- dlls/crypt32/cert.c | 4 ++++ dlls/crypt32/tests/cert.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c677556..2780cba 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -115,6 +115,10 @@ PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext( PCCERT_CONTEXT pCertContext) { TRACE("(%p)\n", pCertContext); + + if (!pCertContext) + return NULL; + Context_AddRef((void *)pCertContext, sizeof(CERT_CONTEXT)); return pCertContext; } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index e66b621..844fd28 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3136,6 +3136,16 @@ static void testGetPublicKeyLength(void) ok(ret == 56, "Expected length 56, got %d\n", ret); } +static void testCertDuplicateCertificateContext(void) +{ + PCCERT_CONTEXT context; + + SetLastError(0xdeadbeef); + context = CertDuplicateCertificateContext(NULL); + ok(context == NULL, "Expected context to be NULL\n"); +} + + START_TEST(cert) { init_function_pointers(); @@ -3163,4 +3173,5 @@ START_TEST(cert) testVerifyRevocation(); testAcquireCertPrivateKey(); testGetPublicKeyLength(); + testCertDuplicateCertificateContext(); }

1 0