October 2007 - Wine-Commits

Dmitry Timoshkov : shlwapi: Update exported API entries according to the info published by Geoff Chappell .
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: c20bf6931a3ed06755120ce8af47b61466a4a1c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20bf6931a3ed06755120ce8a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Oct 26 18:31:55 2007 +0900 shlwapi: Update exported API entries according to the info published by Geoff Chappell. --- dlls/shlwapi/istream.c | 6 +- dlls/shlwapi/ordinal.c | 17 +-- dlls/shlwapi/shlwapi.spec | 351 ++++++++++++++++++++++----------------------- dlls/shlwapi/thread.c | 38 +++--- 4 files changed, 202 insertions(+), 210 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c20bf6931a3ed06755120…

1 0

James Hawkins : msi: Output expected values on failing tests.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: 1d9c680eed138da2b3627d485cd45b7be125c204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9c680eed138da2b3627d485… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 25 15:28:40 2007 -0500 msi: Output expected values on failing tests. --- dlls/msi/tests/suminfo.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index a254b56..6ef98f7 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -391,10 +391,10 @@ static void test_summary_binary(void) type = 0; r = MsiSummaryInfoGetProperty(hsuminfo, PID_LASTPRINTED, &type, NULL, NULL, sval, &sz); ok(r == ERROR_SUCCESS, "MsiSummaryInfoGetProperty failed\n"); - ok( !strcmp(sval, ""), "value incorrect\n"); + ok(!strcmp(sval, ""), "Expected empty string, got %s\n", sval); todo_wine { - ok( type == VT_LPSTR, "type wrong\n"); - ok( sz == 0, "length wrong\n"); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %d\n", type); + ok(sz == 0, "Expected 0, got %d\n", sz); } ival = -1;

1 0

James Hawkins : msi: Define _WIN32_MSI to pull in new definitions.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: a99299126253d98f3ada1224e8899287acbddefa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a99299126253d98f3ada1224e… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 25 15:27:36 2007 -0500 msi: Define _WIN32_MSI to pull in new definitions. --- dlls/msi/tests/msi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 35618e4..043560e 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define _WIN32_MSI 300 + #include <stdio.h> #include <windows.h> #include <msi.h>

1 0

James Hawkins : user32: Define WM_LBTRACKPOINT if it' s not previously defined.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: e6b658c4bf7d48294549d116d357a0caae9cee42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b658c4bf7d48294549d116d… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 25 15:26:48 2007 -0500 user32: Define WM_LBTRACKPOINT if it's not previously defined. --- dlls/user32/tests/msg.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c6c1cd7..769277f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -51,6 +51,10 @@ #define WND_POPUP_ID 2 #define WND_CHILD_ID 3 +#ifndef WM_LBTRACKPOINT +#define WM_LBTRACKPOINT 0x0131 +#endif + /* encoded DRAWITEMSTRUCT into an LPARAM */ typedef struct {

1 0

James Hawkins : user32: Fix a test that now passes in Windows.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: 0c22e540592816037df44449324e8ebee43265e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c22e540592816037df444493… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 25 15:25:27 2007 -0500 user32: Fix a test that now passes in Windows. --- dlls/user32/tests/dde.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 4f4e09c..e78c8c9 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -285,13 +285,20 @@ static void test_ddeml_client(void) DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); - ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %08x\n", res); + ok(hdata != NULL, "Expected non-NULL hdata, got %p\n", hdata); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); todo_wine { - ok(hdata == NULL, "Expected NULL hdata, got %p\n", hdata); - ok(ret == DMLERR_DATAACKTIMEOUT, "Expected DMLERR_DATAACKTIMEOUT, got %d\n", ret); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", res); } + str = (LPSTR)DdeAccessData(hdata, &size); + ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); + ok(size == 19, "Expected 19, got %d\n", size); + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + /* XTYP_REQUEST, fAckReq = TRUE */ res = 0xdeadbeef; DdeGetLastError(client_pid);

1 0

James Hawkins : advpack: Restore the LProgramF string using the acquired Program Files string.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: 9f50d66276c58e08994bab6438ceebcbf03d161d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f50d66276c58e08994bab643… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 25 15:23:15 2007 -0500 advpack: Restore the LProgramF string using the acquired Program Files string. --- dlls/advpack/tests/advpack.c | 48 ++++++++++++++++++++++++----------------- 1 files changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index c80b5e7..b09a9c6 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -20,6 +20,7 @@ */ #include <stdio.h> +#include <stdarg.h> #include <windows.h> #include <advpub.h> #include <assert.h> @@ -45,7 +46,8 @@ static HRESULT (WINAPI *pTranslateInfStringEx)(HINF,PCSTR,PCSTR,PCSTR,PSTR,DWORD static CHAR inf_file[MAX_PATH]; static CHAR PROG_FILES_ROOT[MAX_PATH]; static CHAR PROG_FILES[MAX_PATH]; -static DWORD PROG_FILES_LEN; +static CHAR APP_PATH[MAX_PATH]; +static DWORD APP_PATH_LEN; static void get_progfiles_dir(void) { @@ -56,9 +58,10 @@ static void get_progfiles_dir(void) RegQueryValueExA(hkey, "ProgramFilesDir", NULL, NULL, (LPBYTE)PROG_FILES_ROOT, &size); RegCloseKey(hkey); - lstrcpyA(PROG_FILES, PROG_FILES_ROOT); - lstrcatA(PROG_FILES, TEST_STRING1); - PROG_FILES_LEN = lstrlenA(PROG_FILES) + 1; + lstrcpyA(PROG_FILES, PROG_FILES_ROOT + 3); /* skip C:\ */ + lstrcpyA(APP_PATH, PROG_FILES_ROOT); + lstrcatA(APP_PATH, TEST_STRING1); + APP_PATH_LEN = lstrlenA(APP_PATH) + 1; } static BOOL init_function_pointers(void) @@ -182,10 +185,14 @@ static void delnode_test(void) currDir[currDirLen] = '\0'; } -static void append_str(char **str, const char *data) +static void append_str(char **str, const char *data, ...) { - sprintf(*str, data); + va_list valist; + + va_start(valist, data); + vsprintf(*str, data, valist); *str += strlen(*str); + va_end(valist); } static void create_inf_file(void) @@ -205,7 +212,7 @@ static void create_inf_file(void) append_str(&ptr, "49030=DestC\n"); append_str(&ptr, "[ProgramFilesDir]\n"); append_str(&ptr, "HKLM,\"Software\\Microsoft\\Windows\\CurrentVersion\","); - append_str(&ptr, "\"ProgramFilesDir\",,\"%%24%%\\%%16422%%\"\n"); + append_str(&ptr, "\"ProgramFilesDir\",,\"%%24%%\\%%LProgramF%%\"\n"); append_str(&ptr, "[section]\n"); append_str(&ptr, "NotACustomDestination=Version\n"); append_str(&ptr, "CustomDestination=CustInstDestSection\n"); @@ -218,8 +225,9 @@ static void create_inf_file(void) append_str(&ptr, "CustomHDestination=CustInstDestSection\n"); append_str(&ptr, "[Strings]\n"); append_str(&ptr, "DefaultAppPath=\"Application Name\"\n"); + append_str(&ptr, "LProgramF=\"%s\"\n", PROG_FILES); append_str(&ptr, "[DestA]\n"); - append_str(&ptr, "HKLM,\"Software\\Garbage\",\"ProgramFilesDir\",,'%%16422%%'\n"); + append_str(&ptr, "HKLM,\"Software\\Garbage\",\"ProgramFilesDir\",,'%%24%%\\%%LProgramF%%'\n"); append_str(&ptr, "[DestB]\n"); append_str(&ptr, "'HKLM','Software\\Microsoft\\Windows\\CurrentVersion',"); append_str(&ptr, "'ProgramFilesDir',,\"%%24%%\"\n"); @@ -286,8 +294,8 @@ static void translateinfstring_test(void) if(hr == ERROR_SUCCESS) { - ok(!strcmp(buffer, PROG_FILES), "Expected '%s', got '%s'\n", PROG_FILES, buffer); - ok(dwSize == PROG_FILES_LEN, "Expected size %d, got %d\n", PROG_FILES_LEN, dwSize); + ok(!strcmp(buffer, APP_PATH), "Expected '%s', got '%s'\n", APP_PATH, buffer); + ok(dwSize == APP_PATH_LEN, "Expected size %d, got %d\n", APP_PATH_LEN, dwSize); } buffer[0] = 0; @@ -402,18 +410,18 @@ static void translateinfstringex_test(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* translate the string with the install section specified */ - memset(buffer, 'a', PROG_FILES_LEN); - buffer[PROG_FILES_LEN - 1] = '\0'; + memset(buffer, 'a', APP_PATH_LEN); + buffer[APP_PATH_LEN - 1] = '\0'; size = MAX_PATH; hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "InstallDir", buffer, size, &size, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(!strcmp(buffer, PROG_FILES), "Expected %s, got %s\n", PROG_FILES, buffer); - ok(size == PROG_FILES_LEN, "Expected size %d, got %d\n", PROG_FILES_LEN, size); + ok(!strcmp(buffer, APP_PATH), "Expected %s, got %s\n", APP_PATH, buffer); + ok(size == APP_PATH_LEN, "Expected size %d, got %d\n", APP_PATH_LEN, size); /* Single quote test (Note size includes null on return from call) */ - memset(buffer, 'a', PROG_FILES_LEN); - buffer[PROG_FILES_LEN - 1] = '\0'; + memset(buffer, 'a', APP_PATH_LEN); + buffer[APP_PATH_LEN - 1] = '\0'; size = MAX_PATH; hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result1", buffer, size, &size, NULL); @@ -423,8 +431,8 @@ static void translateinfstringex_test(void) ok(size == lstrlenA(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", lstrlenA(PROG_FILES_ROOT)+1, size); - memset(buffer, 'a', PROG_FILES_LEN); - buffer[PROG_FILES_LEN - 1] = '\0'; + memset(buffer, 'a', APP_PATH_LEN); + buffer[APP_PATH_LEN - 1] = '\0'; size = MAX_PATH; hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result2", buffer, size, &size, NULL); @@ -439,8 +447,8 @@ static void translateinfstringex_test(void) lstrcpy(drive, PROG_FILES_ROOT); drive[3] = 0x00; /* Just keep the system drive plus '\' */ - memset(buffer, 'a', PROG_FILES_LEN); - buffer[PROG_FILES_LEN - 1] = '\0'; + memset(buffer, 'a', APP_PATH_LEN); + buffer[APP_PATH_LEN - 1] = '\0'; size = MAX_PATH; hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result3", buffer, size, &size, NULL);

1 0

James Hawkins : msi: Set the ROOTDRIVE property so the admin sequence won' t choose its own.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: d258484b0b05814e621e7b830b805bc7a7430c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d258484b0b05814e621e7b830… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 25 15:21:12 2007 -0500 msi: Set the ROOTDRIVE property so the admin sequence won't choose its own. --- dlls/msi/tests/install.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 8d262b0..52de3db 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -140,7 +140,8 @@ static const CHAR property_dat[] = "Property\tValue\n" "PROMPTROLLBACKCOST\tP\n" "Setup\tSetup\n" "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n" - "AdminProperties\tPOSTADMIN\n"; + "AdminProperties\tPOSTADMIN\n" + "ROOTDRIVE\tC:\\\n"; static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" "s72\ti2\tl255\tL255\tL0\ts72\n"

1 0

James Hawkins : msi: Add missing newline to the adm_custom_action table.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: 5169d04ec21da13b73be7506e3d784d9e929face URL: http://source.winehq.org/git/wine.git/?a=commit;h=5169d04ec21da13b73be7506e… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 25 15:20:21 2007 -0500 msi: Add missing newline to the adm_custom_action table. --- dlls/msi/tests/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 24fa343..8d262b0 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -434,7 +434,7 @@ static const CHAR adm_component_dat[] = "Component\tComponentId\tDirectory_\tAtt static const CHAR adm_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" "s72\ti2\tS64\tS0\tS255\n" "CustomAction\tAction\n" - "SetPOSTADMIN\t51\tPOSTADMIN\t1\t"; + "SetPOSTADMIN\t51\tPOSTADMIN\t1\t\n"; static const CHAR adm_admin_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n"

1 0

Jacek Caban : urlmon: Fixed tests on IE7.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: c98ca177a806cb130a7fc2a7b7d21c6a3503fe82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98ca177a806cb130a7fc2a7b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 25 22:26:32 2007 +0200 urlmon: Fixed tests on IE7. --- dlls/urlmon/mk.c | 6 +++--- dlls/urlmon/tests/protocol.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index 2af01f2..2ae76ed 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -122,6 +122,9 @@ static HRESULT WINAPI MkProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); + if(strncmpiW(szUrl, wszMK, sizeof(wszMK)/sizeof(WCHAR))) + return INET_E_INVALID_URL; + memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(BINDINFO); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); @@ -132,9 +135,6 @@ static HRESULT WINAPI MkProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ReleaseBindInfo(&bindinfo); - if(strncmpiW(szUrl, wszMK, sizeof(wszMK)/sizeof(WCHAR))) - return MK_E_SYNTAX; - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL); IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, NULL); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 13b0f15..00335b3 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1404,8 +1404,9 @@ static void test_mk_protocol(void) SET_EXPECT(GetBindInfo); hres = IInternetProtocol_Start(protocol, wrong_url1, &protocol_sink, &bind_info, 0, 0); - ok(hres == MK_E_SYNTAX, "Start failed: %08x, expected MK_E_SYNTAX\n", hres); - CHECK_CALLED(GetBindInfo); + ok(hres == MK_E_SYNTAX || hres == INET_E_INVALID_URL, + "Start failed: %08x, expected MK_E_SYNTAX or INET_E_INVALID_URL\n", hres); + CLEAR_CALLED(GetBindInfo); SET_EXPECT(GetBindInfo); SET_EXPECT(ReportProgress_DIRECTBIND);

1 0

James Hawkins : cabinet: Fix two tests that return E_FAIL on win98.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: e533893da8d2c758d2ee5389d399c5e85301139b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e533893da8d2c758d2ee5389d… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 25 15:19:17 2007 -0500 cabinet: Fix two tests that return E_FAIL on win98. --- dlls/cabinet/tests/extract.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index 5ce5ba8..2cf5154 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -604,8 +604,8 @@ static void test_Extract(void) node = session.FileList; todo_wine { - ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), - "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), got %08x\n", res); + ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL, + "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) or E_FAIL, got %08x\n", res); ok(session.FileSize == 6, "Expected 6, got %d\n", session.FileSize); ok(session.Error.erfOper == FDIERROR_USER_ABORT, "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper); @@ -644,8 +644,8 @@ static void test_Extract(void) res = pExtract(&session, "extract.cab"); todo_wine { - ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), - "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), got %08x\n", res); + ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL, + "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) or E_FAIL, got %08x\n", res); ok(session.FileSize == 26, "Expected 26, got %d\n", session.FileSize); ok(session.Error.erfOper == FDIERROR_USER_ABORT, "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper);

1 0