October 2006 - Wine-commits

Juan Lang : crypt32: Make it clearer where alg ids come from in CryptVerifyCertificateSignatureEx .
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: 44ba993b6ea224104f7aabe9dce67b94e4e43cc9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=44ba993b6ea224104f7aabe… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Oct 3 08:32:10 2006 -0700 crypt32: Make it clearer where alg ids come from in CryptVerifyCertificateSignatureEx. --- dlls/crypt32/cert.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 78efb5a..80a8ce2 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1326,22 +1326,53 @@ static BOOL CRYPT_VerifyCertSignatureFro PCERT_SIGNED_CONTENT_INFO signedCert) { BOOL ret; - ALG_ID algID = CertOIDToAlgId(pubKeyInfo->Algorithm.pszObjId); HCRYPTKEY key; + PCCRYPT_OID_INFO info; + ALG_ID pubKeyID, hashID; + info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, + pubKeyInfo->Algorithm.pszObjId, 0); + if (!info || (info->dwGroupId != CRYPT_PUBKEY_ALG_OID_GROUP_ID && + info->dwGroupId != CRYPT_SIGN_ALG_OID_GROUP_ID)) + { + SetLastError(NTE_BAD_ALGID); + return FALSE; + } + if (info->dwGroupId == CRYPT_PUBKEY_ALG_OID_GROUP_ID) + { + switch (info->Algid) + { + case CALG_RSA_KEYX: + pubKeyID = CALG_RSA_SIGN; + hashID = CALG_SHA1; + break; + case CALG_RSA_SIGN: + pubKeyID = CALG_RSA_SIGN; + hashID = CALG_SHA1; + break; + default: + FIXME("unimplemented for %s\n", pubKeyInfo->Algorithm.pszObjId); + return FALSE; + } + } + else + { + hashID = info->Algid; + if (info->ExtraInfo.cbData >= sizeof(ALG_ID)) + pubKeyID = *(ALG_ID *)info->ExtraInfo.pbData; + else + pubKeyID = hashID; + } /* Load the default provider if necessary */ if (!hCryptProv) hCryptProv = CRYPT_GetDefaultProvider(); ret = CryptImportPublicKeyInfoEx(hCryptProv, dwCertEncodingType, - pubKeyInfo, algID, 0, NULL, &key); + pubKeyInfo, pubKeyID, 0, NULL, &key); if (ret) { HCRYPTHASH hash; - /* Some key algorithms aren't hash algorithms, so map them */ - if (algID == CALG_RSA_SIGN || algID == CALG_RSA_KEYX) - algID = CALG_SHA1; - ret = CryptCreateHash(hCryptProv, algID, 0, 0, &hash); + ret = CryptCreateHash(hCryptProv, hashID, 0, 0, &hash); if (ret) { ret = CryptHashData(hash, signedCert->ToBeSigned.pbData,

1 0

Paul Vriens : wintrust: Win64 printf format warning fixes.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: f230f63ad00f116b6b39aa92f38b2c2348f9b3c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f230f63ad00f116b6b39aa9… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Oct 3 17:06:01 2006 +0200 wintrust: Win64 printf format warning fixes. --- dlls/wintrust/tests/Makefile.in | 1 - dlls/wintrust/tests/register.c | 36 ++++++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/wintrust/tests/Makefile.in b/dlls/wintrust/tests/Makefile.in index 22de62a..790b1af 100644 --- a/dlls/wintrust/tests/Makefile.in +++ b/dlls/wintrust/tests/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = wintrust.dll IMPORTS = user32 advapi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ register.c diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index eb34aa4..8a55c11 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -75,7 +75,7 @@ static void test_AddRem_ActionID(void) ok (!ret, "Expected WintrustAddActionID to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER /* XP/W2K3 */ || GetLastError() == 0xdeadbeef /* Win98/NT4/W2K */, - "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %ld.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %d.\n", GetLastError()); /* NULL functions */ SetLastError(0xdeadbeef); @@ -83,7 +83,7 @@ static void test_AddRem_ActionID(void) ok (!ret, "Expected WintrustAddActionID to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER /* XP/W2K3 */ || GetLastError() == 0xdeadbeef /* Win98/NT4/W2K */, - "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %ld.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %d.\n", GetLastError()); /* All OK (although no functions defined), except cbStruct is not set in ActionIDFunctions */ SetLastError(0xdeadbeef); @@ -92,7 +92,7 @@ static void test_AddRem_ActionID(void) ok (!ret, "Expected WintrustAddActionID to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER /* XP/W2K3 */ || GetLastError() == 0xdeadbeef /* Win98/NT4/W2K */, - "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %ld.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %d.\n", GetLastError()); /* All OK (although no functions defined) and cbStruct is set now */ SetLastError(0xdeadbeef); @@ -101,7 +101,7 @@ static void test_AddRem_ActionID(void) ret = pWintrustAddActionID(&ActionID, 0, &ActionIDFunctions); ok (ret, "Expected WintrustAddActionID to succeed.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); /* All OK and all (but 1) functions are correctly defined. The DLL and entrypoints * are not present. @@ -120,7 +120,7 @@ static void test_AddRem_ActionID(void) ret = pWintrustAddActionID(&ActionID, 0, &ActionIDFunctions); ok (ret, "Expected WintrustAddActionID to succeed.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); /* All OK and all functions are correctly defined. The DLL and entrypoints * are not present. @@ -139,26 +139,26 @@ static void test_AddRem_ActionID(void) ret = pWintrustAddActionID(&ActionID, 0, &ActionIDFunctions); ok (ret, "Expected WintrustAddActionID to succeed.\n"); ok (GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %ld.\n", GetLastError()); + "Expected 0xdeadbeef, got %d.\n", GetLastError()); SetLastError(0xdeadbeef); ret = pWintrustRemoveActionID(&ActionID); - ok ( ret, "WintrustRemoveActionID failed : 0x%08lx\n", GetLastError()); - ok ( GetLastError() == 0xdeadbeef, "Last error should not have been changed: 0x%08lx\n", GetLastError()); + ok ( ret, "WintrustRemoveActionID failed : 0x%08x\n", GetLastError()); + ok ( GetLastError() == 0xdeadbeef, "Last error should not have been changed: 0x%08x\n", GetLastError()); /* NULL input */ SetLastError(0xdeadbeef); ret = pWintrustRemoveActionID(NULL); ok (ret, "Expected WintrustRemoveActionID to succeed.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); /* The passed GUID is removed by a previous call, so it's basically a test with a nonexistent Trust provider */ SetLastError(0xdeadbeef); ret = pWintrustRemoveActionID(&ActionID); ok (ret, "Expected WintrustRemoveActionID to succeed.\n"); ok (GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %ld.\n", GetLastError()); + "Expected 0xdeadbeef, got %d.\n", GetLastError()); } static void test_AddDefaultForUsage(void) @@ -177,14 +177,14 @@ static void test_AddDefaultForUsage(void ret = pWintrustAddDefaultForUsage(NULL, NULL); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); /* NULL defusage */ SetLastError(0xdeadbeef); ret = pWintrustAddDefaultForUsage(oid, NULL); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); /* NULL oid and proper defusage */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -197,7 +197,7 @@ static void test_AddDefaultForUsage(void ret = pWintrustAddDefaultForUsage(NULL, &DefUsage); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); /* Just the ActionID */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -207,7 +207,7 @@ static void test_AddDefaultForUsage(void ret = pWintrustAddDefaultForUsage(oid, &DefUsage); ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); ok (GetLastError() == 0xdeadbeef, - "Last error should not have been changed: 0x%08lx\n", GetLastError()); + "Last error should not have been changed: 0x%08x\n", GetLastError()); /* No ActionID */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -218,7 +218,7 @@ static void test_AddDefaultForUsage(void ret = pWintrustAddDefaultForUsage(oid, &DefUsage); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); /* cbStruct set to 0 */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -231,7 +231,7 @@ static void test_AddDefaultForUsage(void ret = pWintrustAddDefaultForUsage(oid, &DefUsage); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %d.\n", GetLastError()); /* All OK */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -244,7 +244,7 @@ static void test_AddDefaultForUsage(void ret = pWintrustAddDefaultForUsage(oid, &DefUsage); ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); ok (GetLastError() == 0xdeadbeef, - "Last error should not have been changed: 0x%08lx\n", GetLastError()); + "Last error should not have been changed: 0x%08x\n", GetLastError()); /* There is no corresponding remove for WintrustAddDefaultForUsage * so we delete the registry key manually. @@ -252,7 +252,7 @@ static void test_AddDefaultForUsage(void if (ret) { res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, Usages); - ok (res == ERROR_SUCCESS, "Key delete failed : 0x%08lx\n", res); + ok (res == ERROR_SUCCESS, "Key delete failed : 0x%08x\n", res); } }

1 0

Eric Pouech : ntdll: Implemented AmILastThread information class for NtQueryInformationThread.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: 8cb932ea894a664b9347ec6860d0c065cb481453 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8cb932ea894a664b9347ec6… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Oct 1 08:17:27 2006 +0200 ntdll: Implemented AmILastThread information class for NtQueryInformationThread. --- dlls/ntdll/thread.c | 18 +++++++++++++++++- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/thread.c | 5 +++-- server/trace.c | 2 ++ 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 364c86d..151ff1e 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1167,6 +1167,23 @@ #else #endif return status; } + case ThreadAmILastThread: + { + SERVER_START_REQ(get_thread_info) + { + req->handle = handle; + req->tid_in = 0; + status = wine_server_call( req ); + if (status == STATUS_SUCCESS) + { + BOOLEAN last = reply->last; + if (data) memcpy( data, &last, min( length, sizeof(last) )); + if (ret_len) *ret_len = min( length, sizeof(last) ); + } + } + SERVER_END_REQ; + return status; + } case ThreadPriority: case ThreadBasePriority: case ThreadAffinityMask: @@ -1176,7 +1193,6 @@ #endif case ThreadQuerySetWin32StartAddress: case ThreadZeroTlsCell: case ThreadPerformanceCount: - case ThreadAmILastThread: case ThreadIdealProcessor: case ThreadPriorityBoost: case ThreadSetTlsArrayAddress: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b8c8a7c..0801c82 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -388,6 +388,7 @@ struct get_thread_info_reply int affinity; abs_time_t creation_time; abs_time_t exit_time; + int last; }; @@ -4405,6 +4406,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 246 +#define SERVER_PROTOCOL_VERSION 247 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 0d014dd..80a4af4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -347,6 +347,7 @@ #define SET_PROCESS_INFO_AFFINITY 0x02 int affinity; /* thread affinity mask */ abs_time_t creation_time; /* thread creation time */ abs_time_t exit_time; /* thread exit time */ + int last; /* last thread in process */ @END diff --git a/server/thread.c b/server/thread.c index 56cdbd2..6644e59 100644 --- a/server/thread.c +++ b/server/thread.c @@ -950,8 +950,9 @@ DECL_HANDLER(get_thread_info) reply->affinity = thread->affinity; reply->creation_time.sec = thread->creation_time.tv_sec; reply->creation_time.usec = thread->creation_time.tv_usec; - reply->exit_time.sec = thread->exit_time.tv_sec; - reply->exit_time.usec = thread->exit_time.tv_usec; + reply->exit_time.sec = thread->exit_time.tv_sec; + reply->exit_time.usec = thread->exit_time.tv_usec; + reply->last = thread->process->running_threads == 1; release_object( thread ); } diff --git a/server/trace.c b/server/trace.c index 7f0538b..8cf7306 100644 --- a/server/trace.c +++ b/server/trace.c @@ -772,6 +772,8 @@ static void dump_get_thread_info_reply( fprintf( stderr, "," ); fprintf( stderr, " exit_time=" ); dump_abs_time( &req->exit_time ); + fprintf( stderr, "," ); + fprintf( stderr, " last=%d", req->last ); } static void dump_set_thread_info_request( const struct set_thread_info_request *req )

1 0

Francois Gouget : comctl32: Fix LVM_GETITEM/ LVIF_STATE so it only returns the bits it
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: 20eb2f99987334120327b3eca18297ae894a7185 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=20eb2f99987334120327b3e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:49:01 2006 +0200 comctl32: Fix LVM_GETITEM/LVIF_STATE so it only returns the bits it has been asked for, and sets all the others to zero (with conformance test). --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 108d055..b66d047 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5364,7 +5364,7 @@ static BOOL LISTVIEW_GetItemT(LISTVIEW_I /* ... the state field (this one is different due to uCallbackmask) */ if (lpLVItem->mask & LVIF_STATE) { - lpLVItem->state = lpItem->state; + lpLVItem->state = lpItem->state & lpLVItem->stateMask; if (dispInfo.item.mask & LVIF_STATE) { lpLVItem->state &= ~dispInfo.item.stateMask; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e96ad26..5d166e0 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -189,6 +189,16 @@ static void test_checkboxes(void) r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); ok(item.state == 0x2aaa, "state %x\n", item.state); + /* Check that only the bits we asked for are returned, + * and that all the others are set to zero + */ + item.iItem = 3; + item.mask = LVIF_STATE; + item.stateMask = 0xf000; + item.state = 0xffff; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(item.state == 0x2000, "state %x\n", item.state); + /* Set the style again and check that doesn't change an item's state */ r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES); ok(r == LVS_EX_CHECKBOXES, "ret %lx\n", r);

1 0

Eric Pouech : ntdll-kernel32: WaitCommEvent.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: d990c0d8e50c5eaabac8b855b9511cbc42d783bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d990c0d8e50c5eaabac8b85… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Sep 30 21:20:41 2006 +0200 ntdll-kernel32: WaitCommEvent. - implemented IOCTL_SERIAL_WAIT_ON_MASK for DeviceIoControl on serial lines in ntdll - now using thread pool (instead of simple thread) for the background operations (this should help some high load situations) - used this to implement WaitCommEvent on top NtDll functions - in kernel32, removed now the no longer used termios/ioctls... for comm devices --- dlls/kernel32/comm.c | 345 -------------------------------------------------- dlls/ntdll/serial.c | 320 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 313 insertions(+), 352 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d990c0d8e50c5eaabac…

1 0

Eric Pouech : winedbg: Rewrote the file handling to use SearchPath instead of home grown version.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: 6a0568a11a655ca77c31e173d23a9770c8aa19b5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a0568a11a655ca77c31e17… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Oct 1 08:16:20 2006 +0200 winedbg: Rewrote the file handling to use SearchPath instead of home grown version. --- programs/winedbg/source.c | 147 ++++++++++++++++++--------------------------- 1 files changed, 58 insertions(+), 89 deletions(-) diff --git a/programs/winedbg/source.c b/programs/winedbg/source.c index 8c6e955..c1fb2eb 100644 --- a/programs/winedbg/source.c +++ b/programs/winedbg/source.c @@ -28,13 +28,6 @@ #endif #include "debugger.h" -struct search_list -{ - char* path; - struct search_list* next; -}; - - struct open_file_list { char* path; @@ -47,45 +40,55 @@ struct open_file_list static struct open_file_list* source_ofiles; -static struct search_list* source_list_head; +static char* search_path; /* = NULL; */ static char source_current_file[PATH_MAX]; static int source_start_line = -1; static int source_end_line = -1; void source_show_path(void) { - struct search_list* sl; + const char* ptr; + const char* next; dbg_printf("Search list:\n"); - for (sl = source_list_head; sl; sl = sl->next) dbg_printf("\t%s\n", sl->path); + for (ptr = search_path; ptr; ptr = next) + { + next = strchr(ptr, ';'); + if (next) + dbg_printf("\t%.*s\n", next++ - ptr, ptr); + else + dbg_printf("\t%s\n", ptr); + } dbg_printf("\n"); } void source_add_path(const char* path) { - struct search_list* sl; - - if (!(sl = HeapAlloc(GetProcessHeap(), 0, sizeof(struct search_list)))) - return; + char* new; + unsigned size; - sl->next = source_list_head; - sl->path = strcpy(HeapAlloc(GetProcessHeap(), 0, strlen(path) + 1), path); - source_list_head = sl; + size = strlen(path) + 1; + if (search_path) + { + unsigned pos = HeapSize(GetProcessHeap(), 0, search_path); + new = HeapReAlloc(GetProcessHeap(), 0, search_path, pos + size); + if (!new || !pos) return; + new[pos - 1] = ';'; + strcpy(&new[pos], path); + } + else + { + new = HeapAlloc(GetProcessHeap(), 0, size); + if (!new) return; + strcpy(new, path); + } + search_path = new; } void source_nuke_path(void) { - struct search_list* sl; - struct search_list* nxt; - - for (sl = source_list_head; sl; sl = nxt) - { - nxt = sl->next; - HeapFree(GetProcessHeap(), 0, sl->path); - HeapFree(GetProcessHeap(), 0, sl); - } - - source_list_head = NULL; + HeapFree(GetProcessHeap(), 0, search_path); + search_path = NULL; } static void* source_map_file(const char* name, HANDLE* hMap, unsigned* size) @@ -128,9 +131,7 @@ static int source_display(const char* so const char* basename = NULL; char* pnt; int rtn; - struct search_list* sl; HANDLE hMap; - DWORD status; char tmppath[PATH_MAX]; /* @@ -157,21 +158,20 @@ static int source_display(const char* so /* * Crapola. We need to try and open the file. */ - status = GetFileAttributes(sourcefile); - if (status != INVALID_FILE_ATTRIBUTES) + strcpy(tmppath, sourcefile); + if (GetFileAttributes(sourcefile) == INVALID_FILE_ATTRIBUTES && + (!search_path || !SearchPathA(search_path, sourcefile, NULL, MAX_PATH, tmppath, NULL))) { - strcpy(tmppath, sourcefile); - } - else if ((status = GetFileAttributes(basename)) != INVALID_FILE_ATTRIBUTES) - { - strcpy(tmppath, basename); - } - else - { - for (sl = source_list_head; sl; sl = sl->next) + if (dbg_interactiveP) { - strcpy(tmppath, sl->path); - if (tmppath[strlen(tmppath) - 1] != '/' && tmppath[strlen(tmppath) - 1] != '\\') + char zbuf[256]; + /* + * Still couldn't find it. Ask user for path to add. + */ + snprintf(zbuf, sizeof(zbuf), "Enter path to file '%s': ", sourcefile); + input_read_line(zbuf, tmppath, sizeof(tmppath)); + + if (tmppath[strlen(tmppath) - 1] != '/') { strcat(tmppath, "/"); } @@ -179,55 +179,24 @@ static int source_display(const char* so * Now append the base file name. */ strcat(tmppath, basename); - - status = GetFileAttributes(tmppath); - if (status != INVALID_FILE_ATTRIBUTES) break; } - if (sl == NULL) + if (GetFileAttributes(tmppath) == INVALID_FILE_ATTRIBUTES) { - if (dbg_interactiveP) - { - char zbuf[256]; - /* - * Still couldn't find it. Ask user for path to add. - */ - snprintf(zbuf, sizeof(zbuf), "Enter path to file '%s': ", sourcefile); - input_read_line(zbuf, tmppath, sizeof(tmppath)); - - if (tmppath[strlen(tmppath) - 1] != '/') - { - strcat(tmppath, "/"); - } - /* - * Now append the base file name. - */ - strcat(tmppath, basename); - - status = GetFileAttributes(tmppath); - } - else - { - status = INVALID_FILE_ATTRIBUTES; - strcpy(tmppath, sourcefile); - } - - if (status == INVALID_FILE_ATTRIBUTES) - { - /* - * OK, I guess the user doesn't really want to see it - * after all. - */ - ol = HeapAlloc(GetProcessHeap(), 0, sizeof(*ol)); - ol->path = strcpy(HeapAlloc(GetProcessHeap(), 0, strlen(sourcefile) + 1), sourcefile); - ol->real_path = NULL; - ol->next = source_ofiles; - ol->nlines = 0; - ol->linelist = NULL; - source_ofiles = ol; - dbg_printf("Unable to open file '%s'\n", tmppath); - return FALSE; - } + /* + * OK, I guess the user doesn't really want to see it + * after all. + */ + ol = HeapAlloc(GetProcessHeap(), 0, sizeof(*ol)); + ol->path = strcpy(HeapAlloc(GetProcessHeap(), 0, strlen(sourcefile) + 1), sourcefile); + ol->real_path = NULL; + ol->next = source_ofiles; + ol->nlines = 0; + ol->linelist = NULL; + ol->size = 0; + source_ofiles = ol; + dbg_printf("Unable to open file '%s'\n", tmppath); + return FALSE; } } /*

1 0

Francois Gouget : oleaut32: Remove unnecessary casts.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: 96f393178d454712b5c06622b87bcb370fdc48ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96f393178d454712b5c0662… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:46:53 2006 +0200 oleaut32: Remove unnecessary casts. --- dlls/oleaut32/tests/olefont.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 1192dc9..51e4dcb 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -633,7 +633,7 @@ static void test_ReleaseHfont(void) IFont_get_hFont(ifnt2,&hfnt2); /* Try invalid HFONT */ - hres = IFont_ReleaseHfont(ifnt1,(HFONT)0); + hres = IFont_ReleaseHfont(ifnt1,NULL); ok(hres == E_INVALIDARG, "IFont_ReleaseHfont: (Bad HFONT) Expected E_INVALIDARG but got 0x%08lx\n", hres); @@ -708,7 +708,7 @@ static void test_AddRefHfont(void) IFont_get_hFont(ifnt2,&hfnt2); /* Try invalid HFONT */ - hres = IFont_AddRefHfont(ifnt1,(HFONT)0); + hres = IFont_AddRefHfont(ifnt1,NULL); ok(hres == E_INVALIDARG, "IFont_AddRefHfont: (Bad HFONT) Expected E_INVALIDARG but got 0x%08lx\n", hres);

1 0

Francois Gouget : include: Add missing PSP_ constants.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: f68d8ed9b42074786120a3c24aafb4d6e3d67b5e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f68d8ed9b42074786120a3c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:47:33 2006 +0200 include: Add missing PSP_ constants. --- include/prsht.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/prsht.h b/include/prsht.h index d6aada7..b11d0d0 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -230,6 +230,8 @@ #define PSP_PREMATURE 0x0400 #define PSP_HIDEHEADER 0x00000800 #define PSP_USEHEADERTITLE 0x00001000 #define PSP_USEHEADERSUBTITLE 0x00002000 +#define PSP_USEFUSIONCONTEXT 0x00004000 +#define PSP_COMMANDLINKS 0x00040000 #define PSPCB_RELEASE 1 #define PSPCB_CREATE 2

1 0

Francois Gouget : include: Add missing STATUS_CTX_ constants.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: 3a03248a7c251760a7bbf247a5df8f31c5a671a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a03248a7c251760a7bbf24… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 12:48:13 2006 +0200 include: Add missing STATUS_CTX_ constants. --- include/ntstatus.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/ntstatus.h b/include/ntstatus.h index 8d2ceae..8ce804e 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1057,6 +1057,8 @@ #define STATUS_CTX_CLIENT_LICENSE_NOT_SE #define STATUS_CTX_CLIENT_LICENSE_IN_USE ((NTSTATUS) 0xC00A0034) #define STATUS_CTX_SHADOW_ENDED_BY_MODE_CHANGE ((NTSTATUS) 0xC00A0035) #define STATUS_CTX_SHADOW_NOT_RUNNING ((NTSTATUS) 0xC00A0036) +#define STATUS_CTX_LOGON_DISABLED ((NTSTATUS) 0xC00A0037) +#define STATUS_CTX_SECURITY_LAYER_ERROR ((NTSTATUS) 0xC00A0038) #define STATUS_CLUSTER_INVALID_NODE ((NTSTATUS) 0xC0130001) #define STATUS_CLUSTER_NODE_EXISTS ((NTSTATUS) 0xC0130002)

1 0

James Hawkins : msi: Implement MsiDatabaseImport.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: 6be7ba7546f9d38ca0d3b6006ff4895dad4d83fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6be7ba7546f9d38ca0d3b60… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Sep 28 12:58:16 2006 -0700 msi: Implement MsiDatabaseImport. --- dlls/msi/database.c | 413 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/db.c | 87 +++------- dlls/msi/tests/install.c | 68 ++------ 3 files changed, 462 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6be7ba7546f9d38ca0d…

1 0