February 2009 - Wine-commits

Aric Stewart : msctf: Stub implementation of SetInputScopes.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 096643dfa65386b565594bdd41a0883e8cb78236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096643dfa65386b565594bdd4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 5 13:13:02 2009 -0600 msctf: Stub implementation of SetInputScopes. --- dlls/msctf/msctf.c | 17 +++++++++++++++++ dlls/msctf/msctf.spec | 2 +- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 314a5c4..1f5e35b 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -233,3 +233,20 @@ HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope) FIXME("STUB: %p %i\n",hwnd,inputscope); return S_OK; } + +/*********************************************************************** + * SetInputScopes(MSCTF.@) + */ +HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, + UINT cInputScopes, WCHAR **ppszPhraseList, + UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS) +{ + int i; + FIXME("STUB: %p ... %s %s\n",hwnd, debugstr_w(pszRegExp), debugstr_w(pszSRGS)); + for (i = 0; i < cInputScopes; i++) + TRACE("\tScope[%i] = %i\n",i,pInputScopes[i]); + for (i = 0; i < cPhrases; i++) + TRACE("\tPhrase[%i] = %s\n",i,debugstr_w(ppszPhraseList[i])); + + return S_OK; +} diff --git a/dlls/msctf/msctf.spec b/dlls/msctf/msctf.spec index d6e6b66..1c8bb37 100644 --- a/dlls/msctf/msctf.spec +++ b/dlls/msctf/msctf.spec @@ -4,7 +4,7 @@ @ stdcall -private DllUnregisterServer() @ stdcall SetInputScope(long long) @ stub SetInputScopeXML -@ stub SetInputScopes +@ stdcall SetInputScopes(long ptr long ptr long wstr wstr) @ stub TF_CUASAppFix @ stub TF_CheckThreadInputIdle @ stub TF_ClearLangBarAddIns

1 0

André Hentschel : winemaker: Add odbccp32 to default link list.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 8052c1a2304b9a09496b847bbd012544359dce53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8052c1a2304b9a09496b847bb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Feb 5 17:36:39 2009 +0100 winemaker: Add odbccp32 to default link list. --- tools/winemaker | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 918cd2a..8c78987 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -807,9 +807,8 @@ sub source_scan_directory($$$$) } my $basename=$target_name; $basename=~ s/\.(dll|exe)$//i; - # This is the default link list of Visual Studio, except odbccp32 - # which we don't have in Wine. - my @std_imports=qw(odbc32 ole32 oleaut32 winspool); + # This is the default link list of Visual Studio + my @std_imports=qw(odbc32 ole32 oleaut32 winspool odbccp32); my @std_libraries=qw(uuid); if ((@$target[$T_FLAGS] & $TF_NODLLS) == 0) { @$target[$T_DLLS]=\@std_imports;

1 0

David Hedberg : msvcrt: Implement _mbcjistojms.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 2254a549a66f053c906a281057e4548a8e66313e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2254a549a66f053c906a28105… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jan 24 00:37:57 2009 +0100 msvcrt: Implement _mbcjistojms. --- dlls/msvcrt/mbcs.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 23 +++++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d1a84e7..a6e0cca 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -318,6 +318,42 @@ unsigned int CDECL _mbctoupper(unsigned int c) } /********************************************************************* + * _mbcjistojms(MSVCRT.@) + * + * Converts a jis character to sjis. + * Based on description from + * http://www.slayers.ne.jp/~oouchi/code/jistosjis.html + */ +unsigned int CDECL _mbcjistojms(unsigned int c) +{ + /* Conversion takes place only when codepage is 932. + In all other cases, c is returned unchanged */ + if(MSVCRT___lc_codepage == 932) + { + if(HIBYTE(c) >= 0x21 && HIBYTE(c) <= 0x7e && + LOBYTE(c) >= 0x21 && LOBYTE(c) <= 0x7e) + { + if(HIBYTE(c) % 2) + c += 0x1f; + else + c += 0x7d; + + if(LOBYTE(c) > 0x7F) + c += 0x1; + + c = (((HIBYTE(c) - 0x21)/2 + 0x81) << 8) | LOBYTE(c); + + if(HIBYTE(c) > 0x9f) + c += 0x4000; + } + else + return 0; /* Codepage is 932, but c can't be converted */ + } + + return c; +} + +/********************************************************************* * _mbsdec(MSVCRT.@) */ unsigned char* CDECL _mbsdec(const unsigned char* start, const unsigned char* cur) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 32ef01c..1a9bc12 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -358,7 +358,7 @@ @ cdecl _mbbtype(long long) # extern _mbcasemap @ cdecl _mbccpy (str str) -@ stub _mbcjistojms #(long) +@ cdecl _mbcjistojms (long) @ stub _mbcjmstojis #(long) @ cdecl _mbclen(ptr) @ stub _mbctohira #(long) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 9134100..45c40d5 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -597,6 +597,28 @@ static void test_wcscpy_s(void) ok(szDestShort[0] == 0, "szDestShort[0] not 0\n"); } +static void test_mbcjisjms(void) +{ + /* List of value-pairs to test. The test assumes the last pair to be {0, ..} */ + unsigned int jisjms[][2] = { {0x2020, 0}, {0x2021, 0}, {0x2120, 0}, {0x2121, 0x8140}, + {0x7f7f, 0}, {0x7f7e, 0}, {0x7e7f, 0}, {0x7e7e, 0xeffc}, + {0x2121FFFF, 0}, {0x2223, 0x81a1}, {0x237e, 0x829e}, {0, 0}}; + unsigned int ret, exp, i; + + i = 0; + do + { + ret = _mbcjistojms(jisjms[i][0]); + + if(_getmbcp() == 932) /* Japanese codepage? */ + exp = jisjms[i][1]; + else + exp = jisjms[i][0]; /* If not, no conversion */ + + ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); + } while(jisjms[i++][0] != 0); +} + START_TEST(string) { char mem[100]; @@ -637,6 +659,7 @@ START_TEST(string) test_strcpy_s(); test_strcat_s(); test__mbsnbcpy_s(); + test_mbcjisjms(); test_wcscpy_s(); }

1 0

Aric Stewart : msctf: Stub for SetInputScope.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: b7a47e72236d4e55148c24fa7e7529532349cad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a47e72236d4e55148c24fa7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 5 13:12:55 2009 -0600 msctf: Stub for SetInputScope. --- dlls/msctf/msctf.c | 9 +++++++++ dlls/msctf/msctf.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 78b2bc3..314a5c4 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -224,3 +224,12 @@ HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim) return S_OK; } + +/*********************************************************************** + * SetInputScope(MSCTF.@) + */ +HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope) +{ + FIXME("STUB: %p %i\n",hwnd,inputscope); + return S_OK; +} diff --git a/dlls/msctf/msctf.spec b/dlls/msctf/msctf.spec index faa9019..d6e6b66 100644 --- a/dlls/msctf/msctf.spec +++ b/dlls/msctf/msctf.spec @@ -2,7 +2,7 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() -@ stub SetInputScope +@ stdcall SetInputScope(long long) @ stub SetInputScopeXML @ stub SetInputScopes @ stub TF_CUASAppFix

1 0

Christoph von Wittich : kernel32: DeviceIoControl: lpBytesReturned must not be NULL if lpOverlapped is NULL.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 4192d34dd9694660df8de7303a53979e3e387f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4192d34dd9694660df8de7303… Author: Christoph von Wittich <Christoph(a)ApiViewer.de> Date: Thu Feb 5 14:37:46 2009 +0100 kernel32: DeviceIoControl: lpBytesReturned must not be NULL if lpOverlapped is NULL. --- dlls/kernel32/comm.c | 54 +++++++++++++++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index d83eacb..0fbd7e3 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -551,7 +551,8 @@ BOOL WINAPI BuildCommDCBW( */ BOOL WINAPI SetCommBreak(HANDLE handle) { - return DeviceIoControl(handle, IOCTL_SERIAL_SET_BREAK_ON, NULL, 0, NULL, 0, NULL, NULL); + DWORD dwBytesReturned; + return DeviceIoControl(handle, IOCTL_SERIAL_SET_BREAK_ON, NULL, 0, NULL, 0, &dwBytesReturned, NULL); } /***************************************************************************** @@ -573,7 +574,8 @@ BOOL WINAPI SetCommBreak(HANDLE handle) */ BOOL WINAPI ClearCommBreak(HANDLE handle) { - return DeviceIoControl(handle, IOCTL_SERIAL_SET_BREAK_OFF, NULL, 0, NULL, 0, NULL, NULL); + DWORD dwBytesReturned; + return DeviceIoControl(handle, IOCTL_SERIAL_SET_BREAK_OFF, NULL, 0, NULL, 0, &dwBytesReturned, NULL); } /***************************************************************************** @@ -595,6 +597,7 @@ BOOL WINAPI ClearCommBreak(HANDLE handle) BOOL WINAPI EscapeCommFunction(HANDLE handle, UINT func) { DWORD ioc; + DWORD dwBytesReturned; switch (func) { @@ -612,7 +615,7 @@ BOOL WINAPI EscapeCommFunction(HANDLE handle, UINT func) SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - return DeviceIoControl(handle, ioc, NULL, 0, NULL, 0, NULL, NULL); + return DeviceIoControl(handle, ioc, NULL, 0, NULL, 0, &dwBytesReturned, NULL); } /******************************************************************** @@ -632,8 +635,9 @@ BOOL WINAPI EscapeCommFunction(HANDLE handle, UINT func) */ BOOL WINAPI PurgeComm(HANDLE handle, DWORD flags) { + DWORD dwBytesReturned; return DeviceIoControl(handle, IOCTL_SERIAL_PURGE, &flags, sizeof(flags), - NULL, 0, NULL, NULL); + NULL, 0, &dwBytesReturned, NULL); } /***************************************************************************** @@ -654,9 +658,10 @@ BOOL WINAPI PurgeComm(HANDLE handle, DWORD flags) BOOL WINAPI ClearCommError(HANDLE handle, LPDWORD errors, LPCOMSTAT lpStat) { SERIAL_STATUS ss; + DWORD dwBytesReturned; if (!DeviceIoControl(handle, IOCTL_SERIAL_GET_COMMSTATUS, NULL, 0, - &ss, sizeof(ss), NULL, NULL)) + &ss, sizeof(ss), &dwBytesReturned, NULL)) return FALSE; if (errors) @@ -708,11 +713,12 @@ BOOL WINAPI ClearCommError(HANDLE handle, LPDWORD errors, LPCOMSTAT lpStat) BOOL WINAPI SetupComm(HANDLE handle, DWORD insize, DWORD outsize) { SERIAL_QUEUE_SIZE sqs; + DWORD dwBytesReturned; sqs.InSize = insize; sqs.OutSize = outsize; return DeviceIoControl(handle, IOCTL_SERIAL_SET_QUEUE_SIZE, - &sqs, sizeof(sqs), NULL, 0, NULL, NULL); + &sqs, sizeof(sqs), NULL, 0, &dwBytesReturned, NULL); } /***************************************************************************** @@ -732,9 +738,10 @@ BOOL WINAPI SetupComm(HANDLE handle, DWORD insize, DWORD outsize) */ BOOL WINAPI GetCommMask(HANDLE handle, LPDWORD evtmask) { + DWORD dwBytesReturned; TRACE("handle %p, mask %p\n", handle, evtmask); return DeviceIoControl(handle, IOCTL_SERIAL_GET_WAIT_MASK, - NULL, 0, evtmask, sizeof(*evtmask), NULL, NULL); + NULL, 0, evtmask, sizeof(*evtmask), &dwBytesReturned, NULL); } /***************************************************************************** @@ -755,9 +762,10 @@ BOOL WINAPI GetCommMask(HANDLE handle, LPDWORD evtmask) */ BOOL WINAPI SetCommMask(HANDLE handle, DWORD evtmask) { + DWORD dwBytesReturned; TRACE("handle %p, mask %x\n", handle, evtmask); return DeviceIoControl(handle, IOCTL_SERIAL_SET_WAIT_MASK, - &evtmask, sizeof(evtmask), NULL, 0, NULL, NULL); + &evtmask, sizeof(evtmask), NULL, 0, &dwBytesReturned, NULL); } static void dump_dcb(const DCB* lpdcb) @@ -797,6 +805,7 @@ BOOL WINAPI SetCommState( HANDLE handle, LPDCB lpdcb) SERIAL_LINE_CONTROL slc; SERIAL_HANDFLOW shf; SERIAL_CHARS sc; + DWORD dwBytesReturned; if (lpdcb == NULL) { @@ -858,13 +867,13 @@ BOOL WINAPI SetCommState( HANDLE handle, LPDCB lpdcb) * so flow control does not interfere. */ return (DeviceIoControl(handle, IOCTL_SERIAL_SET_BAUD_RATE, - &sbr, sizeof(sbr), NULL, 0, NULL, NULL) && + &sbr, sizeof(sbr), NULL, 0, &dwBytesReturned, NULL) && DeviceIoControl(handle, IOCTL_SERIAL_SET_LINE_CONTROL, - &slc, sizeof(slc), NULL, 0, NULL, NULL) && + &slc, sizeof(slc), NULL, 0, &dwBytesReturned, NULL) && DeviceIoControl(handle, IOCTL_SERIAL_SET_HANDFLOW, - &shf, sizeof(shf), NULL, 0, NULL, NULL) && + &shf, sizeof(shf), NULL, 0, &dwBytesReturned, NULL) && DeviceIoControl(handle, IOCTL_SERIAL_SET_CHARS, - &sc, sizeof(sc), NULL, 0, NULL, NULL)); + &sc, sizeof(sc), NULL, 0, &dwBytesReturned, NULL)); } @@ -891,6 +900,7 @@ BOOL WINAPI GetCommState(HANDLE handle, LPDCB lpdcb) SERIAL_LINE_CONTROL slc; SERIAL_HANDFLOW shf; SERIAL_CHARS sc; + DWORD dwBytesReturned; TRACE("handle %p, ptr %p\n", handle, lpdcb); @@ -901,13 +911,13 @@ BOOL WINAPI GetCommState(HANDLE handle, LPDCB lpdcb) } if (!DeviceIoControl(handle, IOCTL_SERIAL_GET_BAUD_RATE, - NULL, 0, &sbr, sizeof(sbr), NULL, NULL) || + NULL, 0, &sbr, sizeof(sbr), &dwBytesReturned, NULL) || !DeviceIoControl(handle, IOCTL_SERIAL_GET_LINE_CONTROL, - NULL, 0, &slc, sizeof(slc), NULL, NULL) || + NULL, 0, &slc, sizeof(slc), &dwBytesReturned, NULL) || !DeviceIoControl(handle, IOCTL_SERIAL_GET_HANDFLOW, - NULL, 0, &shf, sizeof(shf), NULL, NULL) || + NULL, 0, &shf, sizeof(shf), &dwBytesReturned, NULL) || !DeviceIoControl(handle, IOCTL_SERIAL_GET_CHARS, - NULL, 0, &sc, sizeof(sc), NULL, NULL)) + NULL, 0, &sc, sizeof(sc), &dwBytesReturned, NULL)) return FALSE; memset(lpdcb, 0, sizeof(*lpdcb)); @@ -980,8 +990,9 @@ BOOL WINAPI GetCommState(HANDLE handle, LPDCB lpdcb) */ BOOL WINAPI TransmitCommChar(HANDLE hComm, CHAR chTransmit) { + DWORD dwBytesReturned; return DeviceIoControl(hComm, IOCTL_SERIAL_IMMEDIATE_CHAR, - &chTransmit, sizeof(chTransmit), NULL, 0, NULL, NULL); + &chTransmit, sizeof(chTransmit), NULL, 0, &dwBytesReturned, NULL); } @@ -1002,6 +1013,7 @@ BOOL WINAPI TransmitCommChar(HANDLE hComm, CHAR chTransmit) BOOL WINAPI GetCommTimeouts(HANDLE hComm, LPCOMMTIMEOUTS lptimeouts) { SERIAL_TIMEOUTS st; + DWORD dwBytesReturned; TRACE("(%p, %p)\n", hComm, lptimeouts); if (!lptimeouts) @@ -1010,7 +1022,7 @@ BOOL WINAPI GetCommTimeouts(HANDLE hComm, LPCOMMTIMEOUTS lptimeouts) return FALSE; } if (!DeviceIoControl(hComm, IOCTL_SERIAL_GET_TIMEOUTS, - NULL, 0, &st, sizeof(st), NULL, NULL)) + NULL, 0, &st, sizeof(st), &dwBytesReturned, NULL)) return FALSE; lptimeouts->ReadIntervalTimeout = st.ReadIntervalTimeout; lptimeouts->ReadTotalTimeoutMultiplier = st.ReadTotalTimeoutMultiplier; @@ -1043,6 +1055,7 @@ BOOL WINAPI GetCommTimeouts(HANDLE hComm, LPCOMMTIMEOUTS lptimeouts) BOOL WINAPI SetCommTimeouts(HANDLE hComm, LPCOMMTIMEOUTS lptimeouts) { SERIAL_TIMEOUTS st; + DWORD dwBytesReturned; TRACE("(%p, %p)\n", hComm, lptimeouts); @@ -1058,7 +1071,7 @@ BOOL WINAPI SetCommTimeouts(HANDLE hComm, LPCOMMTIMEOUTS lptimeouts) st.WriteTotalTimeoutConstant = lptimeouts->WriteTotalTimeoutConstant; return DeviceIoControl(hComm, IOCTL_SERIAL_SET_TIMEOUTS, - &st, sizeof(st), NULL, 0, NULL, NULL); + &st, sizeof(st), NULL, 0, &dwBytesReturned, NULL); } /*********************************************************************** @@ -1078,8 +1091,9 @@ BOOL WINAPI SetCommTimeouts(HANDLE hComm, LPCOMMTIMEOUTS lptimeouts) */ BOOL WINAPI GetCommModemStatus(HANDLE hFile, LPDWORD lpModemStat) { + DWORD dwBytesReturned; return DeviceIoControl(hFile, IOCTL_SERIAL_GET_MODEMSTATUS, - NULL, 0, lpModemStat, sizeof(DWORD), NULL, NULL); + NULL, 0, lpModemStat, sizeof(DWORD), &dwBytesReturned, NULL); } /***********************************************************************

1 0

Juan Lang : shell32: Fix a few tests on Windows 98 and Vista.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 029c3fbb8dced0feb9abc8a97454e657950d41dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=029c3fbb8dced0feb9abc8a97… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 5 07:29:02 2009 -0800 shell32: Fix a few tests on Windows 98 and Vista. --- dlls/shell32/tests/shellpath.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 71c236b..f6298d4 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -90,9 +90,10 @@ static LPMALLOC pMalloc; static const BYTE guidType[] = { PT_GUID }; static const BYTE controlPanelType[] = { PT_SHELLEXT, PT_GUID }; static const BYTE folderType[] = { PT_FOLDER }; -static const BYTE favoritesType[] = { PT_FOLDER, 0 }; +static const BYTE favoritesType[] = { PT_FOLDER, 0, PT_IESPECIAL2 /* Win98 */ }; static const BYTE folderOrSpecialType[] = { PT_FOLDER, PT_IESPECIAL2 }; -static const BYTE personalType[] = { PT_FOLDER, PT_GUID, PT_DRIVE, 0xff /* Win9x */ }; +static const BYTE personalType[] = { PT_FOLDER, PT_GUID, PT_DRIVE, 0xff /* Win9x */, + PT_IESPECIAL2 /* Win98 */, 0 /* Vista */ }; /* FIXME: don't know the type of 0x71 returned by Vista/2008 for printers */ static const BYTE printersType[] = { PT_YAGUID, PT_SHELLEXT, 0x71 }; static const BYTE ieSpecialType[] = { PT_IESPECIAL2 };

1 0

Rob Shearman : ole32: Fix an ole2 test failure on Win9x and NT4.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 40660894c811c551dc9b7c1549db030989156d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40660894c811c551dc9b7c154… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Feb 5 16:22:30 2009 +0000 ole32: Fix an ole2 test failure on Win9x and NT4. The combination of CF_BITMAP and TYMED_GLOBAL isn't accepted on newer versions of Windows, so mark it as broken. --- dlls/ole32/tests/ole2.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 42b8fa6..2c5ed47 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1167,7 +1167,8 @@ static void test_data_cache(void) ok(hr == S_OK, "IOleCache_Cache cfFormat = %d, tymed = %d should have returned S_OK instead of 0x%08x\n", fmtetc.cfFormat, fmtetc.tymed, hr); else if (fmtetc.tymed == TYMED_HGLOBAL) - ok(hr == CACHE_S_FORMATETC_NOTSUPPORTED, + ok(hr == CACHE_S_FORMATETC_NOTSUPPORTED || + broken(hr == S_OK && fmtetc.cfFormat == CF_BITMAP) /* Win9x & NT4 */, "IOleCache_Cache cfFormat = %d, tymed = %d should have returned CACHE_S_FORMATETC_NOTSUPPORTED instead of 0x%08x\n", fmtetc.cfFormat, fmtetc.tymed, hr); else

1 0

Rob Shearman : rpcrt4: Change the test of CStdStubBuffer-> pPSFactory to only test for the field not being NULL.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 7fe67b159d755f52a2db5bd4076291e9ffcf878a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe67b159d755f52a2db5bd40… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Feb 5 16:23:54 2009 +0000 rpcrt4: Change the test of CStdStubBuffer->pPSFactory to only test for the field not being NULL. The address varies on older versions of Windows and isn't really important. --- dlls/rpcrt4/tests/cstub.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 88bf0e5..be775cc 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -619,15 +619,13 @@ static void test_CreateStub(IPSFactoryBuffer *ppsf) IUnknown *obj = (IUnknown*)&vtbl; IRpcStubBuffer *pstub = create_stub(ppsf, &IID_if1, obj, S_OK); CStdStubBuffer *cstd_stub = (CStdStubBuffer*)pstub; - const CInterfaceStubHeader *header = ((const CInterfaceStubHeader *)cstd_stub->lpVtbl) - 1; + const CInterfaceStubHeader *header = &CONTAINING_RECORD(cstd_stub->lpVtbl, const CInterfaceStubVtbl, Vtbl)->header; ok(IsEqualIID(header->piid, &IID_if1), "header iid differs\n"); ok(cstd_stub->RefCount == 1, "ref count %d\n", cstd_stub->RefCount); /* 0xdeadbeef returned from create_stub_test_QI */ ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject); - ok(cstd_stub->pPSFactory == ppsf || - broken(cstd_stub->pPSFactory == (void *)0x00001000) /* Win9x & NT4 */, - "pPSFactory was %p instead of %p\n", cstd_stub->pPSFactory, ppsf); + ok(cstd_stub->pPSFactory != NULL, "pPSFactory was NULL\n"); vtbl = &create_stub_test_fail_vtbl; pstub = create_stub(ppsf, &IID_if1, obj, E_NOINTERFACE);

1 0

Alexandre Julliard : fonts: Copy the TrueType fonts to the build directory for out-of-tree builds.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: e01452bf45c9053d6cd15f9f000df0f52d4ae719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01452bf45c9053d6cd15f9f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 5 21:13:34 2009 +0100 fonts: Copy the TrueType fonts to the build directory for out-of-tree builds. --- fonts/Makefile.in | 96 ++++++++++++++++++++++++++++------------------------ 1 files changed, 52 insertions(+), 44 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 6caad01..0fe7cc3 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -1,7 +1,6 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = .. SRCDIR = @srcdir@ -VPATH = @srcdir@ MODULE = none fontdir = $(datadir)/wine/fonts INSTALLDIRS = $(DESTDIR)$(fontdir) @@ -52,131 +51,139 @@ TRUETYPE_FONTS = \ tahoma.ttf \ tahomabd.ttf -FONTS = \ - $(BITMAP_FONTS) \ - $(TRUETYPE_FONTS:%=$(SRCDIR)/%) +FONTS = $(BITMAP_FONTS) $(TRUETYPE_FONTS) all: $(FONTS) @MAKE_RULES@ -coure.fon: courier.ttf +coure.fon: $(SRCDIR)/courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1252,8 -couree.fon: courier.ttf +couree.fon: $(SRCDIR)/courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1250,8 -courer.fon: courier.ttf +courer.fon: $(SRCDIR)/courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1251,8 -coureg.fon: courier.ttf +coureg.fon: $(SRCDIR)/courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1253,8 -couret.fon: courier.ttf +couret.fon: $(SRCDIR)/courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1254,8 -coue1255.fon: courier.ttf +coue1255.fon: $(SRCDIR)/courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1255,8 -coue1256.fon: courier.ttf +coue1256.fon: $(SRCDIR)/courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1256,8 -coue1257.fon: courier.ttf +coue1257.fon: $(SRCDIR)/courier.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/courier.ttf 13,1257,8 -sserife.fon: ms_sans_serif.ttf +sserife.fon: $(SRCDIR)/ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8 -sserifee.fon: ms_sans_serif.ttf +sserifee.fon: $(SRCDIR)/ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1250,5 16,1250,7 -sserifer.fon: ms_sans_serif.ttf +sserifer.fon: $(SRCDIR)/ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1251,5 16,1251,7 20,1251,8 -sserifeg.fon: ms_sans_serif.ttf +sserifeg.fon: $(SRCDIR)/ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1253,5 16,1253,7 20,1253,8 -sserifet.fon: ms_sans_serif.ttf +sserifet.fon: $(SRCDIR)/ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1254,5 16,1254,7 20,1254,8 -ssee1255.fon: ms_sans_serif.ttf +ssee1255.fon: $(SRCDIR)/ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1255,5 16,1255,7 20,1255,8 -ssee1256.fon: ms_sans_serif.ttf +ssee1256.fon: $(SRCDIR)/ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1256,5 16,1256,7 20,1256,8 -ssee1257.fon: ms_sans_serif.ttf +ssee1257.fon: $(SRCDIR)/ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,1257,5 16,1257,7 20,1257,8 -ssee874.fon: ms_sans_serif.ttf +ssee874.fon: $(SRCDIR)/ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(SRCDIR)/ms_sans_serif.ttf 13,874,5 16,874,7 20,874,8 -smalle.fon: small_fonts.ttf +smalle.fon: $(SRCDIR)/small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1252,5 -smallee.fon: small_fonts.ttf +smallee.fon: $(SRCDIR)/small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1250,5 -smaller.fon: small_fonts.ttf +smaller.fon: $(SRCDIR)/small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1251,5 -smalleg.fon: small_fonts.ttf +smalleg.fon: $(SRCDIR)/small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1253,5 -smallet.fon: small_fonts.ttf +smallet.fon: $(SRCDIR)/small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1254,5 -smae1255.fon: small_fonts.ttf +smae1255.fon: $(SRCDIR)/small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1255,5 -smae1256.fon: small_fonts.ttf +smae1256.fon: $(SRCDIR)/small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1256,5 -smae1257.fon: small_fonts.ttf +smae1257.fon: $(SRCDIR)/small_fonts.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts.ttf 11,1257,5 -jsmalle.fon: small_fonts_jp.ttf +jsmalle.fon: $(SRCDIR)/small_fonts_jp.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/small_fonts_jp.ttf 11,932,7 -vgasys.fon: system.ttf +vgasys.fon: $(SRCDIR)/system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1252,7 -vgasyse.fon: system.ttf +vgasyse.fon: $(SRCDIR)/system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1250,7 -vgasysr.fon: system.ttf +vgasysr.fon: $(SRCDIR)/system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1251,7 -vgasysg.fon: system.ttf +vgasysg.fon: $(SRCDIR)/system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1253,7 -vgasyst.fon: system.ttf +vgasyst.fon: $(SRCDIR)/system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1254,7 -vgas1255.fon: system.ttf +vgas1255.fon: $(SRCDIR)/system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1255,7 -vgas1256.fon: system.ttf +vgas1256.fon: $(SRCDIR)/system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1256,7 -vgas1257.fon: system.ttf +vgas1257.fon: $(SRCDIR)/system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,1257,7 -vgas874.fon: system.ttf +vgas874.fon: $(SRCDIR)/system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,874,7 -jvgasys.fon: system.ttf +jvgasys.fon: $(SRCDIR)/system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 18,932,8 -svgasys.fon: system.ttf +svgasys.fon: $(SRCDIR)/system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,936,7 16,1252,7 -hvgasys.fon: system.ttf +hvgasys.fon: $(SRCDIR)/system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,949,7 -cvgasys.fon: system.ttf +cvgasys.fon: $(SRCDIR)/system.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(SRCDIR)/system.ttf 16,950,7 16,1252,7 +# Use $(TOPSRCDIR)/fonts instead of $(SRCDIR) to confuse make when building in the source tree +marlett.ttf: $(TOPSRCDIR)/fonts/marlett.ttf + [ $(SRCDIR) = . ] || ($(RM) $@ && $(LN_S) $(SRCDIR)/marlett.ttf $@) + +tahoma.ttf: $(TOPSRCDIR)/fonts/tahoma.ttf + [ $(SRCDIR) = . ] || ($(RM) $@ && $(LN_S) $(SRCDIR)/tahoma.ttf $@) + +tahomabd.ttf: $(TOPSRCDIR)/fonts/tahomabd.ttf + [ $(SRCDIR) = . ] || ($(RM) $@ && $(LN_S) $(SRCDIR)/tahomabd.ttf $@) + $(BITMAP_FONTS): $(SFNT2FNT) install install-lib:: $(FONTS) $(INSTALLDIRS) @@ -184,8 +191,9 @@ install install-lib:: $(FONTS) $(INSTALLDIRS) for i in $(TRUETYPE_FONTS); do $(INSTALL_DATA) $(SRCDIR)/$$i $(DESTDIR)$(fontdir)/$$i || exit 1; done uninstall:: - -cd $(DESTDIR)$(fontdir) && $(RM) $(BITMAP_FONTS) $(TRUETYPE_FONTS) + -cd $(DESTDIR)$(fontdir) && $(RM) $(FONTS) -rmdir $(DESTDIR)$(fontdir) clean:: $(RM) $(BITMAP_FONTS) + [ $(SRCDIR) = . ] || $(RM) $(TRUETYPE_FONTS)

1 0

Jacek Caban : tools: Added Wine Gecko 0.9.1 redirection.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: tools Branch: master Commit: db8ff6f38e70f933b37509529423679eb6a5a647 URL: http://source.winehq.org/git/tools.git/?a=commit;h=db8ff6f38e70f933b3750952… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 5 21:17:40 2009 +0100 tools: Added Wine Gecko 0.9.1 redirection. --- winegecko.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index ce47e6a..141c815 100644 --- a/winegecko.php +++ b/winegecko.php @@ -24,7 +24,8 @@ $aFileSizes = array( 'default'=>5219822, '0.0.1'=>5219822, '0.1.0'=>5746895, - '0.9.0'=>7806669 + '0.9.0'=>7806669, + '0.9.1'=>7806837 ); // Exact size of the file:

1 0