October 2007 - Wine-commits

Bang Jun-young : version: Use the official NT macro rather than obsolete one.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: a290263860ccb747cfe1f8cab7ff9c91c953117b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a290263860ccb747cfe1f8cab… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Mon Oct 15 17:56:57 2007 +0900 version: Use the official NT macro rather than obsolete one. --- dlls/version/resource.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index 08e4098..03076d8 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -289,7 +289,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, pehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); if ( sizeof(pehd) != LZRead( lzfd, (LPSTR)&pehd, sizeof(pehd) ) ) return 0; - resDataDir = pehd.OptionalHeader.DataDirectory+IMAGE_FILE_RESOURCE_DIRECTORY; + resDataDir = pehd.OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_RESOURCE; if ( !resDataDir->Size ) { TRACE("No resources in PE dll\n" );

1 0

Lei Zhang : comctl32: Simplify monthcal test.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 3accf13ec0882ca66820d00c77f9892ae6cd0d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3accf13ec0882ca66820d00c7… Author: Lei Zhang <thestig(a)google.com> Date: Sun Oct 14 15:32:29 2007 -0700 comctl32: Simplify monthcal test. --- dlls/comctl32/tests/monthcal.c | 21 ++++----------------- 1 files changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index b78f70e..9deef21 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -124,7 +124,6 @@ static const struct message monthcal_color_seq[] = { static const struct message monthcal_curr_date_seq[] = { { MCM_SETCURSEL, sent|wparam, 0}, { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, - { WM_NCPAINT, sent|wparam|lparam|defwinproc, 1, 0}, { WM_ERASEBKGND, sent|lparam|defwinproc, 0}, { MCM_SETCURSEL, sent|wparam, 0}, { MCM_SETCURSEL, sent|wparam, 0}, @@ -202,11 +201,6 @@ static const struct message monthcal_unicode_seq[] = { static const struct message monthcal_hit_test_seq[] = { { MCM_SETCURSEL, sent|wparam, 0}, { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, - { WM_NCPAINT, sent|wparam|lparam|defwinproc, 1, 0}, - { WM_ERASEBKGND, sent|lparam|defwinproc, 0}, - { WM_SETFONT, sent|lparam, 0, 0}, - { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, - { WM_ERASEBKGND, sent|lparam|defwinproc, 0}, { MCM_HITTEST, sent|wparam, 0}, { MCM_HITTEST, sent|wparam, 0}, { MCM_HITTEST, sent|wparam, 0}, @@ -230,8 +224,6 @@ static const struct message monthcal_hit_test_seq[] = { static const struct message monthcal_today_seq[] = { { MCM_SETTODAY, sent|wparam, 0}, { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, - { WM_NCPAINT, sent|wparam|lparam|defwinproc, 1, 0}, - { WM_ERASEBKGND, sent|lparam|defwinproc, 0}, { MCM_GETTODAY, sent|wparam, 0}, { MCM_SETTODAY, sent|wparam, 0}, { WM_PAINT, sent|wparam|lparam|defwinproc, 0, 0}, @@ -714,15 +706,12 @@ static void test_monthcal_unicode(HWND hwnd) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_unicode_seq, "monthcal unicode", FALSE); } -static void test_monthcal_HitTest(HWND parent_wnd) +static void test_monthcal_HitTest(HWND hwnd) { MCHITTESTINFO mchit; int res; - HWND hwnd; SYSTEMTIME st; - hwnd = create_monthcal_control(WS_CHILD | WS_BORDER | WS_VISIBLE, parent_wnd); - assert(hwnd); memset(&mchit, 0, sizeof(MCHITTESTINFO)); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -739,8 +728,6 @@ static void test_monthcal_HitTest(HWND parent_wnd) res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st); expect(1,res); - SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0); - /* (0, 0) is the top left of the control and should not be active */ mchit.cbSize = sizeof(MCHITTESTINFO); mchit.pt.x = 0; @@ -907,8 +894,6 @@ static void test_monthcal_HitTest(HWND parent_wnd) todo_wine {expect(MCHT_TODAYLINK, res);} ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_hit_test_seq, "monthcal hit test", TRUE); - - DestroyWindow(hwnd); } static void test_monthcal_today(HWND hwnd) @@ -1068,14 +1053,16 @@ START_TEST(monthcal) assert(hwnd); ok_sequence(sequences, PARENT_SEQ_INDEX, create_monthcal_control_seq, "create monthcal control", TRUE); + SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0); + test_monthcal_color(hwnd); test_monthcal_currDate(hwnd); test_monthcal_firstDay(hwnd); test_monthcal_unicode(hwnd); - test_monthcal_HitTest(parent_wnd); test_monthcal_today(hwnd); test_monthcal_scroll(hwnd); test_monthcal_monthrange(hwnd); + test_monthcal_HitTest(hwnd); flush_sequences(sequences, NUM_MSG_SEQUENCES); DestroyWindow(hwnd);

1 0

Gerald Pfeifer : crypt32: Fix incorrect casts in X509_CERT and friends.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 119e4d495578faa81f0e9b1e376363099d253fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=119e4d495578faa81f0e9b1e3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Oct 15 13:58:45 2007 +0200 crypt32: Fix incorrect casts in X509_CERT and friends. --- dlls/crypt32/encode.c | 66 ++++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 3dbadd8..fc55d98 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3488,101 +3488,101 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, { switch (LOWORD(lpszStructType)) { - case (WORD)X509_CERT: + case LOWORD(X509_CERT): encodeFunc = CRYPT_AsnEncodeCert; break; - case (WORD)X509_CERT_TO_BE_SIGNED: + case LOWORD(X509_CERT_TO_BE_SIGNED): encodeFunc = CRYPT_AsnEncodeCertInfo; break; - case (WORD)X509_CERT_CRL_TO_BE_SIGNED: + case LOWORD(X509_CERT_CRL_TO_BE_SIGNED): encodeFunc = CRYPT_AsnEncodeCRLInfo; break; - case (WORD)X509_EXTENSIONS: + case LOWORD(X509_EXTENSIONS): encodeFunc = CRYPT_AsnEncodeExtensions; break; - case (WORD)X509_NAME_VALUE: + case LOWORD(X509_NAME_VALUE): encodeFunc = CRYPT_AsnEncodeNameValue; break; - case (WORD)X509_NAME: + case LOWORD(X509_NAME): encodeFunc = CRYPT_AsnEncodeName; break; - case (WORD)X509_PUBLIC_KEY_INFO: + case LOWORD(X509_PUBLIC_KEY_INFO): encodeFunc = CRYPT_AsnEncodePubKeyInfo; break; - case (WORD)X509_AUTHORITY_KEY_ID: + case LOWORD(X509_AUTHORITY_KEY_ID): encodeFunc = CRYPT_AsnEncodeAuthorityKeyId; break; - case (WORD)X509_ALTERNATE_NAME: + case LOWORD(X509_ALTERNATE_NAME): encodeFunc = CRYPT_AsnEncodeAltName; break; - case (WORD)X509_BASIC_CONSTRAINTS: + case LOWORD(X509_BASIC_CONSTRAINTS): encodeFunc = CRYPT_AsnEncodeBasicConstraints; break; - case (WORD)X509_BASIC_CONSTRAINTS2: + case LOWORD(X509_BASIC_CONSTRAINTS2): encodeFunc = CRYPT_AsnEncodeBasicConstraints2; break; - case (WORD)RSA_CSP_PUBLICKEYBLOB: + case LOWORD(RSA_CSP_PUBLICKEYBLOB): encodeFunc = CRYPT_AsnEncodeRsaPubKey; break; - case (WORD)X509_UNICODE_NAME: + case LOWORD(X509_UNICODE_NAME): encodeFunc = CRYPT_AsnEncodeUnicodeName; break; - case (WORD)PKCS_CONTENT_INFO: + case LOWORD(PKCS_CONTENT_INFO): encodeFunc = CRYPT_AsnEncodePKCSContentInfo; break; - case (WORD)PKCS_ATTRIBUTE: + case LOWORD(PKCS_ATTRIBUTE): encodeFunc = CRYPT_AsnEncodePKCSAttribute; break; - case (WORD)X509_UNICODE_NAME_VALUE: + case LOWORD(X509_UNICODE_NAME_VALUE): encodeFunc = CRYPT_AsnEncodeUnicodeNameValue; break; - case (WORD)X509_OCTET_STRING: + case LOWORD(X509_OCTET_STRING): encodeFunc = CRYPT_AsnEncodeOctets; break; - case (WORD)X509_BITS: - case (WORD)X509_KEY_USAGE: + case LOWORD(X509_BITS): + case LOWORD(X509_KEY_USAGE): encodeFunc = CRYPT_AsnEncodeBits; break; - case (WORD)X509_INTEGER: + case LOWORD(X509_INTEGER): encodeFunc = CRYPT_AsnEncodeInt; break; - case (WORD)X509_MULTI_BYTE_INTEGER: + case LOWORD(X509_MULTI_BYTE_INTEGER): encodeFunc = CRYPT_AsnEncodeInteger; break; - case (WORD)X509_MULTI_BYTE_UINT: + case LOWORD(X509_MULTI_BYTE_UINT): encodeFunc = CRYPT_AsnEncodeUnsignedInteger; break; - case (WORD)X509_ENUMERATED: + case LOWORD(X509_ENUMERATED): encodeFunc = CRYPT_AsnEncodeEnumerated; break; - case (WORD)X509_CHOICE_OF_TIME: + case LOWORD(X509_CHOICE_OF_TIME): encodeFunc = CRYPT_AsnEncodeChoiceOfTime; break; - case (WORD)X509_AUTHORITY_KEY_ID2: + case LOWORD(X509_AUTHORITY_KEY_ID2): encodeFunc = CRYPT_AsnEncodeAuthorityKeyId2; break; - case (WORD)X509_SEQUENCE_OF_ANY: + case LOWORD(X509_SEQUENCE_OF_ANY): encodeFunc = CRYPT_AsnEncodeSequenceOfAny; break; - case (WORD)PKCS_UTC_TIME: + case LOWORD(PKCS_UTC_TIME): encodeFunc = CRYPT_AsnEncodeUtcTime; break; - case (WORD)X509_CRL_DIST_POINTS: + case LOWORD(X509_CRL_DIST_POINTS): encodeFunc = CRYPT_AsnEncodeCRLDistPoints; break; - case (WORD)X509_ENHANCED_KEY_USAGE: + case LOWORD(X509_ENHANCED_KEY_USAGE): encodeFunc = CRYPT_AsnEncodeEnhancedKeyUsage; break; - case (WORD)PKCS_ATTRIBUTES: + case LOWORD(PKCS_ATTRIBUTES): encodeFunc = CRYPT_AsnEncodePKCSAttributes; break; - case (WORD)X509_ISSUING_DIST_POINT: + case LOWORD(X509_ISSUING_DIST_POINT): encodeFunc = CRYPT_AsnEncodeIssuingDistPoint; break; - case (WORD)X509_NAME_CONSTRAINTS: + case LOWORD(X509_NAME_CONSTRAINTS): encodeFunc = CRYPT_AsnEncodeNameConstraints; break; - case (WORD)PKCS7_SIGNER_INFO: + case LOWORD(PKCS7_SIGNER_INFO): encodeFunc = CRYPT_AsnEncodePKCSSignerInfo; break; }

1 0

Bang Jun-young : configure: Add check for presence of _strdup() and strdup( ).
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: ff96bd6aec29d3e4809829e3e50c15e3b36d6173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff96bd6aec29d3e4809829e3e… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Mon Oct 15 17:09:12 2007 +0900 configure: Add check for presence of _strdup() and strdup(). --- configure | 4 ++++ configure.ac | 2 ++ include/config.h.in | 6 ++++++ include/wine/port.h | 4 ++++ 4 files changed, 16 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 51b8f62..1153f74 100755 --- a/configure +++ b/configure @@ -15703,11 +15703,14 @@ esac + + for ac_func in \ _pclose \ _popen \ _snprintf \ _spawnvp \ + _strdup \ _stricmp \ _strnicmp \ _vsnprintf \ @@ -15756,6 +15759,7 @@ for ac_func in \ statfs \ statvfs \ strcasecmp \ + strdup \ strerror \ strncasecmp \ strtold \ diff --git a/configure.ac b/configure.ac index 153e269..b453dc6 100644 --- a/configure.ac +++ b/configure.ac @@ -1227,6 +1227,7 @@ AC_CHECK_FUNCS(\ _popen \ _snprintf \ _spawnvp \ + _strdup \ _stricmp \ _strnicmp \ _vsnprintf \ @@ -1275,6 +1276,7 @@ AC_CHECK_FUNCS(\ statfs \ statvfs \ strcasecmp \ + strdup \ strerror \ strncasecmp \ strtold \ diff --git a/include/config.h.in b/include/config.h.in index 8df3a1a..c352c42 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -633,6 +633,9 @@ /* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP + /* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR @@ -945,6 +948,9 @@ /* Define to 1 if you have the `_spawnvp' function. */ #undef HAVE__SPAWNVP +/* Define to 1 if you have the `_strdup' function. */ +#undef HAVE__STRDUP + /* Define to 1 if you have the `_stricmp' function. */ #undef HAVE__STRICMP diff --git a/include/wine/port.h b/include/wine/port.h index b8009cc..4b94a5e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -126,6 +126,10 @@ struct statvfs #define pclose _pclose #endif +#if !defined(HAVE_STRDUP) && defined(HAVE__STRDUP) +#define strdup _strdup +#endif + #if !defined(HAVE_SNPRINTF) && defined(HAVE__SNPRINTF) #define snprintf _snprintf #endif

1 0

James Hawkins : user32: Convert an HDDEDATA handle to a DDEPOKE structure for WM_DDE_POKE.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 9fd2d443fe8ea55d58756f1ff927996810b709ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd2d443fe8ea55d58756f1ff… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 12 00:25:32 2007 -0500 user32: Convert an HDDEDATA handle to a DDEPOKE structure for WM_DDE_POKE. --- dlls/user32/dde_client.c | 41 ++++++++++++++++++++++++----------------- dlls/user32/tests/dde.c | 9 +++------ 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index fe2dada..3e22768 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -697,8 +697,11 @@ static WDML_QUEUE_STATE WDML_HandleExecuteReply(WDML_CONV* pConv, MSG* msg, WDML static WDML_XACT* WDML_ClientQueuePoke(WDML_CONV* pConv, LPVOID pData, DWORD cbData, UINT wFmt, HSZ hszItem) { - WDML_XACT* pXAct; - ATOM atom; + DDE_DATAHANDLE_HEAD *dh; + WDML_XACT *pXAct; + DDEPOKE *ddePoke; + HGLOBAL hglobal; + ATOM atom; TRACE("XTYP_POKE transaction\n"); @@ -708,29 +711,33 @@ static WDML_XACT* WDML_ClientQueuePoke(WDML_CONV* pConv, LPVOID pData, DWORD cbD pXAct = WDML_AllocTransaction(pConv->instance, WM_DDE_POKE, wFmt, hszItem); if (!pXAct) { - GlobalDeleteAtom(atom); - return NULL; + GlobalDeleteAtom(atom); + return NULL; } if (cbData == (DWORD)-1) { - pXAct->hMem = (HDDEDATA)pData; + hglobal = (HGLOBAL)pData; + dh = (DDE_DATAHANDLE_HEAD *)GlobalLock(hglobal); + cbData = GlobalSize(hglobal) - sizeof(DDE_DATAHANDLE_HEAD); + pData = (LPVOID)(dh + 1); + GlobalUnlock(hglobal); } - else - { - DDEPOKE* ddePoke; - pXAct->hMem = GlobalAlloc(GHND | GMEM_DDESHARE, sizeof(DDEPOKE) + cbData); - ddePoke = GlobalLock(pXAct->hMem); - if (ddePoke) - { - memcpy(ddePoke->Value, pData, cbData); - ddePoke->fRelease = TRUE; - ddePoke->cfFormat = wFmt; - GlobalUnlock(pXAct->hMem); - } + pXAct->hMem = GlobalAlloc(GHND | GMEM_DDESHARE, sizeof(DDEPOKE) + cbData); + ddePoke = GlobalLock(pXAct->hMem); + if (!ddePoke) + { + pConv->instance->lastError = DMLERR_MEMORY_ERROR; + return NULL; } + ddePoke->unused = 0; + ddePoke->fRelease = TRUE; + ddePoke->cfFormat = wFmt; + memcpy(ddePoke->Value, pData, cbData); + GlobalUnlock(pXAct->hMem); + pXAct->lParam = PackDDElParam(WM_DDE_POKE, (UINT_PTR)pXAct->hMem, atom); return pXAct; diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 1388c34..4f4e09c 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -171,12 +171,9 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA poke = GlobalLock((HGLOBAL)lo); ok(poke != NULL, "Expected non-NULL poke\n"); ok(poke->fReserved == 0, "Expected 0, got %d\n", poke->fReserved); - if (msg_index == 6) todo_wine - { - ok(poke->unused == 0, "Expected 0, got %d\n", poke->unused); - ok(poke->fRelease == TRUE, "Expected TRUE, got %d\n", poke->fRelease); - ok(poke->cfFormat == CF_TEXT, "Expected CF_TEXT, got %d\n", poke->cfFormat); - } + ok(poke->unused == 0, "Expected 0, got %d\n", poke->unused); + ok(poke->fRelease == TRUE, "Expected TRUE, got %d\n", poke->fRelease); + ok(poke->cfFormat == CF_TEXT, "Expected CF_TEXT, got %d\n", poke->cfFormat); if (msg_index == 5) ok(lstrcmpA((LPSTR)poke->Value, "poke data\r\n"),

1 0

Alexandre Julliard : kernel32: Fix GlobalMemoryStatus to take into account the IMAGE_FILE_LARGE_ADDRESS_AWARE flag .
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: b22183703f8f77f8e1e32482f34934cadd207963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22183703f8f77f8e1e32482f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 22:32:36 2007 +0200 kernel32: Fix GlobalMemoryStatus to take into account the IMAGE_FILE_LARGE_ADDRESS_AWARE flag. Also the page file size must not be truncated to 2Gb no matter what the flag is set to. --- dlls/kernel32/heap.c | 57 +++++++++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 587499a..f3b269f 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1220,13 +1220,18 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) int rval; #endif + if (lpmemex->dwLength != sizeof(*lpmemex)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (time(NULL)==cache_lastchecked) { memcpy(lpmemex,&cached_memstatus,sizeof(*lpmemex)); return TRUE; } cache_lastchecked = time(NULL); - lpmemex->dwLength = sizeof(*lpmemex); lpmemex->dwMemoryLoad = 0; lpmemex->ullTotalPhys = 16*1024*1024; lpmemex->ullAvailPhys = 16*1024*1024; @@ -1366,10 +1371,12 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) { MEMORYSTATUSEX memstatus; OSVERSIONINFOW osver; + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( GetModuleHandleW(0) ); /* Because GlobalMemoryStatus is identical to GlobalMemoryStatusEX save for one extra field in the struct, and the lack of a bug, we simply call GlobalMemoryStatusEx and copy the values across. */ + memstatus.dwLength = sizeof(memstatus); GlobalMemoryStatusEx(&memstatus); lpBuffer->dwLength = sizeof(*lpBuffer); @@ -1377,7 +1384,6 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) /* Windows 2000 and later report -1 when values are greater than 4 Gb. * NT reports values modulo 4 Gb. - * Values between 2 Gb and 4 Gb are rounded down to 2 Gb. */ osver.dwOSVersionInfoSize = sizeof(osver); @@ -1385,33 +1391,32 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) if ( osver.dwMajorVersion >= 5 ) { - lpBuffer->dwTotalPhys = (memstatus.ullTotalPhys > MAXDWORD) ? MAXDWORD : - (memstatus.ullTotalPhys > MAXLONG) ? MAXLONG : memstatus.ullTotalPhys; - lpBuffer->dwAvailPhys = (memstatus.ullAvailPhys > MAXDWORD) ? MAXDWORD : - (memstatus.ullAvailPhys > MAXLONG) ? MAXLONG : memstatus.ullAvailPhys; - lpBuffer->dwTotalPageFile = (memstatus.ullTotalPageFile > MAXDWORD) ? MAXDWORD : - (memstatus.ullTotalPageFile > MAXLONG) ? MAXLONG : memstatus.ullTotalPageFile; - lpBuffer->dwAvailPageFile = (memstatus.ullAvailPageFile > MAXDWORD) ? MAXDWORD : - (memstatus.ullAvailPageFile > MAXLONG) ? MAXLONG : memstatus.ullAvailPageFile; - lpBuffer->dwTotalVirtual = (memstatus.ullTotalVirtual > MAXDWORD) ? MAXDWORD : - (memstatus.ullTotalVirtual > MAXLONG) ? MAXLONG : memstatus.ullTotalVirtual; - lpBuffer->dwAvailVirtual = (memstatus.ullAvailVirtual > MAXDWORD) ? MAXDWORD : - (memstatus.ullAvailVirtual > MAXLONG) ? MAXLONG : memstatus.ullAvailVirtual; + lpBuffer->dwTotalPhys = min( memstatus.ullTotalPhys, MAXDWORD ); + lpBuffer->dwAvailPhys = min( memstatus.ullAvailPhys, MAXDWORD ); + lpBuffer->dwTotalPageFile = min( memstatus.ullTotalPageFile, MAXDWORD ); + lpBuffer->dwAvailPageFile = min( memstatus.ullAvailPageFile, MAXDWORD ); + lpBuffer->dwTotalVirtual = min( memstatus.ullTotalVirtual, MAXDWORD ); + lpBuffer->dwAvailVirtual = min( memstatus.ullAvailVirtual, MAXDWORD ); + } else /* duplicate NT bug */ { - lpBuffer->dwTotalPhys = (memstatus.ullTotalPhys > MAXDWORD) ? memstatus.ullTotalPhys : - (memstatus.ullTotalPhys > MAXLONG) ? MAXLONG : memstatus.ullTotalPhys; - lpBuffer->dwAvailPhys = (memstatus.ullAvailPhys > MAXDWORD) ? memstatus.ullAvailPhys : - (memstatus.ullAvailPhys > MAXLONG) ? MAXLONG : memstatus.ullAvailPhys; - lpBuffer->dwTotalPageFile = (memstatus.ullTotalPageFile > MAXDWORD) ? memstatus.ullTotalPageFile : - (memstatus.ullTotalPageFile > MAXLONG) ? MAXLONG : memstatus.ullTotalPageFile; - lpBuffer->dwAvailPageFile = (memstatus.ullAvailPageFile > MAXDWORD) ? memstatus.ullAvailPageFile : - (memstatus.ullAvailPageFile > MAXLONG) ? MAXLONG : memstatus.ullAvailPageFile; - lpBuffer->dwTotalVirtual = (memstatus.ullTotalVirtual > MAXDWORD) ? memstatus.ullTotalVirtual : - (memstatus.ullTotalVirtual > MAXLONG) ? MAXLONG : memstatus.ullTotalVirtual; - lpBuffer->dwAvailVirtual = (memstatus.ullAvailVirtual > MAXDWORD) ? memstatus.ullAvailVirtual : - (memstatus.ullAvailVirtual > MAXLONG) ? MAXLONG : memstatus.ullAvailVirtual; + lpBuffer->dwTotalPhys = memstatus.ullTotalPhys; + lpBuffer->dwAvailPhys = memstatus.ullAvailPhys; + lpBuffer->dwTotalPageFile = memstatus.ullTotalPageFile; + lpBuffer->dwAvailPageFile = memstatus.ullAvailPageFile; + lpBuffer->dwTotalVirtual = memstatus.ullTotalVirtual; + lpBuffer->dwAvailVirtual = memstatus.ullAvailVirtual; + } + + /* values are limited to 2Gb unless the app has the IMAGE_FILE_LARGE_ADDRESS_AWARE flag */ + /* page file sizes are not limited (Adobe Illustrator 8 depends on this) */ + if (!(nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE)) + { + if (lpBuffer->dwTotalPhys > MAXLONG) lpBuffer->dwTotalPhys = MAXLONG; + if (lpBuffer->dwAvailPhys > MAXLONG) lpBuffer->dwAvailPhys = MAXLONG; + if (lpBuffer->dwTotalVirtual > MAXLONG) lpBuffer->dwTotalVirtual = MAXLONG; + if (lpBuffer->dwAvailVirtual > MAXLONG) lpBuffer->dwAvailVirtual = MAXLONG; } /* work around for broken photoshop 4 installer */

1 0

Juan Lang : wincrypt.h: Add a few more definitions.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: a62afe7403b422afdb4652f135e866ee21f540ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62afe7403b422afdb4652f13… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 15 10:52:44 2007 -0700 wincrypt.h: Add a few more definitions. --- include/wincrypt.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index f59bd79..df709fe 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -872,7 +872,13 @@ typedef struct _HTTPSPolicyCallbackData { DWORD dwAuthType; DWORD fdwChecks; WCHAR *pwszServerName; -} HTTPSPolicyCallbackData, *PHTTPSPolicyCallbackData; +} HTTPSPolicyCallbackData, *PHTTPSPolicyCallbackData, + SSL_EXTRA_CERT_CHAIN_POLICY_PARA, *PSSL_EXTRA_CERT_CHAIN_POLICY_PARA; + +/* Values for HTTPSPolicyCallbackData's dwAuthType */ +#define AUTHTYPE_CLIENT 1 +#define AUTHTYPE_SERVER 2 +/* Values for HTTPSPolicyCallbackData's fdwChecks are defined in wininet.h */ #define BASIC_CONSTRAINTS_CERT_CHAIN_POLICY_CA_FLAG 0x80000000 #define BASIC_CONSTRAINTS_CERT_CHAIN_POLICY_END_ENTITY_FLAG 0x40000000

1 0

Juan Lang : wininet.h: Add some more defines.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: dce5feb1a83011c820deb7cbac2fe03c8f1c7238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce5feb1a83011c820deb7cba… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 15 11:15:38 2007 -0700 wininet.h: Add some more defines. --- include/wininet.h | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index 5b1f4fe..8293ce7 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -307,6 +307,70 @@ typedef struct _INTERNET_CACHE_GROUP_INFOW { DECL_WINELIB_TYPE_AW(INTERNET_CACHE_GROUP_INFO) DECL_WINELIB_TYPE_AW(LPINTERNET_CACHE_GROUP_INFO) +typedef struct _INTERNET_PER_CONN_OPTIONA { + DWORD dwOption; + union { + DWORD dwValue; + LPSTR pszValue; + FILETIME ftValue; + } Value; +} INTERNET_PER_CONN_OPTIONA, *LPINTERNET_PER_CONN_OPTIONA; + +typedef struct _INTERNET_PER_CONN_OPTIONW { + DWORD dwOption; + union { + DWORD dwValue; + LPWSTR pszValue; + FILETIME ftValue; + } Value; +} INTERNET_PER_CONN_OPTIONW, *LPINTERNET_PER_CONN_OPTIONW; + +DECL_WINELIB_TYPE_AW(INTERNET_PER_CONN_OPTION) +DECL_WINELIB_TYPE_AW(LPINTERNET_PER_CONN_OPTION) + +#define INTERNET_PER_CONN_FLAGS 1 +#define INTERNET_PER_CONN_PROXY_SERVER 2 +#define INTERNET_PER_CONN_PROXY_BYPASS 3 +#define INTERNET_PER_CONN_AUTOCONFIG_URL 4 +#define INTERNET_PER_CONN_AUTODISCOVERY_FLAGS 5 +#define INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL 6 +#define INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS 7 +#define INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME 8 +#define INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL 9 + +/* Values for INTERNET_PER_CONN_FLAGS */ +#define PROXY_TYPE_DIRECT 0x00000001 +#define PROXY_TYPE_PROXY 0x00000002 +#define PROXY_TYPE_AUTO_PROXY_URL 0x00000004 +#define PROXY_TYPE_AUTO_DETECT 0x00000008 +/* Values for INTERNET_PER_CONN_AUTODISCOVERY_FLAGS */ +#define AUTO_PROXY_FLAG_USER_SET 0x00000001 +#define AUTO_PROXY_FLAG_ALWAYS_DETECT 0x00000002 +#define AUTO_PROXY_FLAG_DETECTION_RUN 0x00000004 +#define AUTO_PROXY_FLAG_MIGRATED 0x00000008 +#define AUTO_PROXY_FLAG_DONT_CACHE_PROXY_RESULT 0x00000010 +#define AUTO_PROXY_FLAG_CACHE_INIT_RUN 0x00000020 +#define AUTO_PROXY_FLAG_DETECTION_SUSPECT 0x00000040 + +typedef struct _INTERNET_PER_CONN_OPTION_LISTA { + DWORD dwSize; + LPSTR pszConnection; + DWORD dwOptionCount; + DWORD dwOptionError; + LPINTERNET_PER_CONN_OPTIONA pOptions; +} INTERNET_PER_CONN_OPTION_LISTA, *LPINTERNET_PER_CONN_OPTION_LISTA; + +typedef struct _INTERNET_PER_CONN_OPTION_LISTW { + DWORD dwSize; + LPWSTR pszConnection; + DWORD dwOptionCount; + DWORD dwOptionError; + LPINTERNET_PER_CONN_OPTIONW pOptions; +} INTERNET_PER_CONN_OPTION_LISTW, *LPINTERNET_PER_CONN_OPTION_LISTW; + +DECL_WINELIB_TYPE_AW(INTERNET_PER_CONN_OPTION_LIST) +DECL_WINELIB_TYPE_AW(LPINTERNET_PER_CONN_OPTION_LIST) + BOOLAPI InternetTimeFromSystemTimeA(CONST SYSTEMTIME *,DWORD ,LPSTR ,DWORD); BOOLAPI InternetTimeFromSystemTimeW(CONST SYSTEMTIME *,DWORD ,LPWSTR ,DWORD); #define InternetTimeFromSystemTime WINELIB_NAME_AW(InternetTimeFromSystemTime)

1 0

Juan Lang : setupapi: Avoid spamming console.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 1392883b8ea51a49b7aa69e5da2155645915f3fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1392883b8ea51a49b7aa69e5d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 15 11:18:22 2007 -0700 setupapi: Avoid spamming console. --- dlls/setupapi/misc.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index bc3e764..1e88485 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -852,7 +852,13 @@ void WINAPI pSetupSetGlobalFlags( DWORD flags ) */ DWORD WINAPI CMP_WaitNoPendingInstallEvents( DWORD dwTimeout ) { - FIXME("%d\n", dwTimeout); + static BOOL warned = FALSE; + + if (!warned) + { + FIXME("%d\n", dwTimeout); + warned = TRUE; + } return WAIT_OBJECT_0; }

1 0

Juan Lang : hhctrl.ocx: Avoid spamming console.
by Alexandre Julliard 16 Oct '07

16 Oct '07

Module: wine Branch: master Commit: 776f434a6e7c00801b6d96a256e8947c2dd61ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=776f434a6e7c00801b6d96a25… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 15 11:19:56 2007 -0700 hhctrl.ocx: Avoid spamming console. --- dlls/hhctrl.ocx/hhctrl.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 44a1eb3..2ca3d84 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -151,6 +151,16 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat return NULL; /* FIXME */ } + case HH_PRETRANSLATEMESSAGE: { + static BOOL warned = FALSE; + + if (!warned) + { + FIXME("HH_PRETRANSLATEMESSAGE unimplemented\n"); + warned = TRUE; + } + return 0; + } default: FIXME("HH case %s not handled.\n", command_to_string( command )); }

1 0