May 2008 - Wine-Commits - list.winehq.org

Paul Vriens : kernel32/tests: Don' t run tests on win9x if we are out of memory.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: 0a4eebd744f23240a89297e7f0f59e43e38ce99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4eebd744f23240a89297e7f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri May 2 12:05:02 2008 +0200 kernel32/tests: Don't run tests on win9x if we are out of memory. --- dlls/kernel32/tests/console.c | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index bccb02f..2885aaa 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -380,6 +380,7 @@ static void testScroll(HANDLE hCon, COORD sbSize) SMALL_RECT scroll, clip; COORD dst, c, tc; CHAR_INFO ci; + BOOL ret; #define W 11 #define H 7 @@ -473,23 +474,32 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Top = H / 2; clip.Bottom = min(H + H / 2, sbSize.Y - 1); - ok(ScrollConsoleScreenBuffer(hCon, &scroll, &clip, dst, &ci), "Scrolling SB\n"); - - for (c.Y = 0; c.Y < sbSize.Y; c.Y++) + SetLastError(0xdeadbeef); + ret = ScrollConsoleScreenBuffer(hCon, &scroll, &clip, dst, &ci); + if (ret) { - for (c.X = 0; c.X < sbSize.X; c.X++) + for (c.Y = 0; c.Y < sbSize.Y; c.Y++) { - if (IN_SRECT2(scroll, dst, c) && IN_SRECT(clip, c)) + for (c.X = 0; c.X < sbSize.X; c.X++) { - tc.X = c.X - dst.X; - tc.Y = c.Y - dst.Y; - okCHAR(hCon, c, CONTENT(tc), DEFAULT_ATTRIB); + if (IN_SRECT2(scroll, dst, c) && IN_SRECT(clip, c)) + { + tc.X = c.X - dst.X; + tc.Y = c.Y - dst.Y; + okCHAR(hCon, c, CONTENT(tc), DEFAULT_ATTRIB); + } + else if (IN_SRECT(scroll, c) && IN_SRECT(clip, c)) + okCHAR(hCon, c, '#', TEST_ATTRIB); + else okCHAR(hCon, c, CONTENT(c), DEFAULT_ATTRIB); } - else if (IN_SRECT(scroll, c) && IN_SRECT(clip, c)) - okCHAR(hCon, c, '#', TEST_ATTRIB); - else okCHAR(hCon, c, CONTENT(c), DEFAULT_ATTRIB); } } + else + { + /* Win9x will fail, Only accept ERROR_NOT_ENOUGH_MEMORY */ + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, + "Expected ERROR_NOT_ENOUGH_MEMORY, got %u\n", GetLastError()); + } /* clipping, src & dst rect do overlap */ resetContent(hCon, sbSize, TRUE);

1 0

ByeongSik Jeon : imm32: Implementation of the ImmRequestMessage{A|W}.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: cedfd3f763deb34ec73b0c948134a26f37c1bb9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cedfd3f763deb34ec73b0c948… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri May 2 12:51:08 2008 +0900 imm32: Implementation of the ImmRequestMessage{A|W}. --- dlls/imm32/imm.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 8b539de..ce28f48 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1815,9 +1815,14 @@ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) */ LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam) { - FIXME("(%p %ld %ld): stub\n", hIMC, wParam, wParam); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("%p %ld %ld\n", hIMC, wParam, wParam); + + if (data && IsWindow(data->IMC.hWnd)) + return SendMessageA(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); + + return 0; } /*********************************************************************** @@ -1825,9 +1830,14 @@ LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam) */ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) { - FIXME("(%p %ld %ld): stub\n", hIMC, wParam, wParam); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("%p %ld %ld\n", hIMC, wParam, wParam); + + if (data && IsWindow(data->IMC.hWnd)) + return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); + + return 0; } /***********************************************************************

1 0

ByeongSik Jeon : imm32: Updated implementation of the ImmGetConversionList{A|W}.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: 37901a6592f3dfd2f03a007aa3fb25e1e03cf19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=37901a6592f3dfd2f03a007aa… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri May 2 12:51:04 2008 +0900 imm32: Updated implementation of the ImmGetConversionList{A|W}. --- dlls/imm32/imm.c | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index f382f2b..8b539de 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1249,9 +1249,21 @@ DWORD WINAPI ImmGetConversionListA( return immHkl->pImeConversionList(hIMC,(LPCWSTR)pSrc,lpDst,dwBufLen,uFlag); else { - FIXME("A procedure called with W ime back end\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + LPCANDIDATELIST lpwDst; + DWORD ret = 0, len; + LPWSTR pwSrc = strdupAtoW(pSrc); + + len = immHkl->pImeConversionList(hIMC, pwSrc, NULL, 0, uFlag); + lpwDst = HeapAlloc(GetProcessHeap(), 0, len); + if ( lpwDst ) + { + immHkl->pImeConversionList(hIMC, pwSrc, lpwDst, len, uFlag); + ret = convert_candidatelist_WtoA( lpwDst, lpDst, dwBufLen); + HeapFree(GetProcessHeap(), 0, lpwDst); + } + HeapFree(GetProcessHeap(), 0, pwSrc); + + return ret; } } else @@ -1275,9 +1287,21 @@ DWORD WINAPI ImmGetConversionListW( return immHkl->pImeConversionList(hIMC,pSrc,lpDst,dwBufLen,uFlag); else { - FIXME("W procedure called with A ime back end\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + LPCANDIDATELIST lpaDst; + DWORD ret = 0, len; + LPSTR paSrc = strdupWtoA(pSrc); + + len = immHkl->pImeConversionList(hIMC, (LPCWSTR)paSrc, NULL, 0, uFlag); + lpaDst = HeapAlloc(GetProcessHeap(), 0, len); + if ( lpaDst ) + { + immHkl->pImeConversionList(hIMC, (LPCWSTR)paSrc, lpaDst, len, uFlag); + ret = convert_candidatelist_AtoW( lpaDst, lpDst, dwBufLen); + HeapFree(GetProcessHeap(), 0, lpaDst); + } + HeapFree(GetProcessHeap(), 0, paSrc); + + return ret; } } else

1 0

James Hawkins : itss: Remove a test that we expect to fail sometimes.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: 863b0cdff7e589e5b2c56c7371efa51540225541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=863b0cdff7e589e5b2c56c737… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri May 2 03:56:47 2008 -0500 itss: Remove a test that we expect to fail sometimes. --- dlls/itss/tests/protocol.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index ea04437..e8aa171 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -303,7 +303,6 @@ static HRESULT _protocol_start(unsigned line, IInternetProtocol *protocol, LPCWS expect_hrResult = S_OK; hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); - ok_(__FILE__,line) (hres == S_OK, "Start failed: %08x\n", hres); if(FAILED(hres)) { SET_CALLED(GetBindInfo);

1 0

ByeongSik Jeon : imm32: Updated implementation of the ImmEnumRegisterWord{A|W}.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: e552a10c7c5b29dc5684d26c81168a9ee9b8c770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e552a10c7c5b29dc5684d26c8… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri May 2 12:50:46 2008 +0900 imm32: Updated implementation of the ImmEnumRegisterWord{A|W}. --- dlls/imm32/imm.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2247cf4..31842a6 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -604,9 +604,17 @@ UINT WINAPI ImmEnumRegisterWordA( (LPCWSTR)lpszReading, dwStyle, (LPCWSTR)lpszRegister, lpData); else { - FIXME("A procedure called with W ime back end\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + LPWSTR lpszwReading = strdupAtoW(lpszReading); + LPWSTR lpszwRegister = strdupAtoW(lpszRegister); + BOOL rc; + + rc = immHkl->pImeEnumRegisterWord((REGISTERWORDENUMPROCW)lpfnEnumProc, + lpszwReading, dwStyle, lpszwRegister, + lpData); + + HeapFree(GetProcessHeap(),0,lpszwReading); + HeapFree(GetProcessHeap(),0,lpszwRegister); + return rc; } } else @@ -631,9 +639,16 @@ UINT WINAPI ImmEnumRegisterWordW( lpszRegister, lpData); else { - FIXME("W procedure called with A ime back end\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + LPSTR lpszaReading = strdupWtoA(lpszReading); + LPSTR lpszaRegister = strdupWtoA(lpszRegister); + BOOL rc; + + rc = immHkl->pImeEnumRegisterWord(lpfnEnumProc, (LPCWSTR)lpszaReading, + dwStyle, (LPCWSTR)lpszaRegister, lpData); + + HeapFree(GetProcessHeap(),0,lpszaReading); + HeapFree(GetProcessHeap(),0,lpszaRegister); + return rc; } } else

1 0

ByeongSik Jeon : imm32: Updated implementation of the ImmGetCandidateList{A|W}.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: 826b50f5ed19308c92324f07548a7e219ca4d3a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=826b50f5ed19308c92324f075… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri May 2 12:50:53 2008 +0900 imm32: Updated implementation of the ImmGetCandidateList{A|W}. --- dlls/imm32/imm.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 142 insertions(+), 14 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 31842a6..590bccc 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -135,6 +135,84 @@ static inline CHAR *strdupWtoA( const WCHAR *str ) return ret; } +static DWORD convert_candidatelist_WtoA( + LPCANDIDATELIST lpSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen) +{ + DWORD ret, i, len; + + ret = FIELD_OFFSET( CANDIDATELIST, dwOffset[lpSrc->dwCount] ); + if ( lpDst && dwBufLen > 0 ) + { + *lpDst = *lpSrc; + lpDst->dwOffset[0] = ret; + } + + for ( i = 0; i < lpSrc->dwCount; i++) + { + LPBYTE src = (LPBYTE)lpSrc + lpSrc->dwOffset[i]; + + if ( lpDst && dwBufLen > 0 ) + { + LPBYTE dest = (LPBYTE)lpDst + lpDst->dwOffset[i]; + + len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)src, -1, + (LPSTR)dest, dwBufLen, NULL, NULL); + + if ( i + 1 < lpSrc->dwCount ) + lpDst->dwOffset[i+1] = lpDst->dwOffset[i] + len * sizeof(char); + dwBufLen -= len * sizeof(char); + } + else + len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)src, -1, NULL, 0, NULL, NULL); + + ret += len * sizeof(char); + } + + if ( lpDst ) + lpDst->dwSize = ret; + + return ret; +} + +static DWORD convert_candidatelist_AtoW( + LPCANDIDATELIST lpSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen) +{ + DWORD ret, i, len; + + ret = FIELD_OFFSET( CANDIDATELIST, dwOffset[lpSrc->dwCount] ); + if ( lpDst && dwBufLen > 0 ) + { + *lpDst = *lpSrc; + lpDst->dwOffset[0] = ret; + } + + for ( i = 0; i < lpSrc->dwCount; i++) + { + LPBYTE src = (LPBYTE)lpSrc + lpSrc->dwOffset[i]; + + if ( lpDst && dwBufLen > 0 ) + { + LPBYTE dest = (LPBYTE)lpDst + lpDst->dwOffset[i]; + + len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)src, -1, + (LPWSTR)dest, dwBufLen); + + if ( i + 1 < lpSrc->dwCount ) + lpDst->dwOffset[i+1] = lpDst->dwOffset[i] + len * sizeof(WCHAR); + dwBufLen -= len * sizeof(WCHAR); + } + else + len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)src, -1, NULL, 0); + + ret += len * sizeof(WCHAR); + } + + if ( lpDst ) + lpDst->dwSize = ret; + + return ret; +} + static IMMThreadData* IMM_GetThreadData(void) { return (IMMThreadData*)TlsGetValue(tlsIndex); @@ -709,15 +787,40 @@ LRESULT WINAPI ImmEscapeW( * ImmGetCandidateListA (IMM32.@) */ DWORD WINAPI ImmGetCandidateListA( - HIMC hIMC, DWORD deIndex, + HIMC hIMC, DWORD dwIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) { - FIXME("(%p, %d, %p, %d): stub\n", - hIMC, deIndex, - lpCandList, dwBufLen - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + InputContextData *data = (InputContextData *)hIMC; + LPCANDIDATEINFO candinfo; + LPCANDIDATELIST candlist; + DWORD ret = 0; + + TRACE("%p, %d, %p, %d\n", hIMC, dwIndex, lpCandList, dwBufLen); + + if (!data || !data->IMC.hCandInfo) + return 0; + + candinfo = ImmLockIMCC(data->IMC.hCandInfo); + if ( dwIndex >= candinfo->dwCount || + dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) ) + goto done; + + candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]); + if ( !candlist->dwSize || !candlist->dwCount ) + goto done; + + if ( !is_himc_ime_unicode(data) ) + { + ret = candlist->dwSize; + if ( lpCandList && dwBufLen >= ret ) + memcpy(lpCandList, candlist, ret); + } + else + ret = convert_candidatelist_WtoA( candlist, lpCandList, dwBufLen); + +done: + ImmUnlockIMCC(data->IMC.hCandInfo); + return ret; } /*********************************************************************** @@ -746,15 +849,40 @@ DWORD WINAPI ImmGetCandidateListCountW( * ImmGetCandidateListW (IMM32.@) */ DWORD WINAPI ImmGetCandidateListW( - HIMC hIMC, DWORD deIndex, + HIMC hIMC, DWORD dwIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) { - FIXME("(%p, %d, %p, %d): stub\n", - hIMC, deIndex, - lpCandList, dwBufLen - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + InputContextData *data = (InputContextData *)hIMC; + LPCANDIDATEINFO candinfo; + LPCANDIDATELIST candlist; + DWORD ret = 0; + + TRACE("%p, %d, %p, %d\n", hIMC, dwIndex, lpCandList, dwBufLen); + + if (!data || !data->IMC.hCandInfo) + return 0; + + candinfo = ImmLockIMCC(data->IMC.hCandInfo); + if ( dwIndex >= candinfo->dwCount || + dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) ) + goto done; + + candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]); + if ( !candlist->dwSize || !candlist->dwCount ) + goto done; + + if ( is_himc_ime_unicode(data) ) + { + ret = candlist->dwSize; + if ( lpCandList && dwBufLen >= ret ) + memcpy(lpCandList, candlist, ret); + } + else + ret = convert_candidatelist_AtoW( candlist, lpCandList, dwBufLen); + +done: + ImmUnlockIMCC(data->IMC.hCandInfo); + return ret; } /***********************************************************************

1 0

ByeongSik Jeon : imm32: Updated implementation of the ImmGetCandidateListCount{A|W}.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: a45a07e4747162d1b1b0ea5c4c8c00b3c1a005ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45a07e4747162d1b1b0ea5c4… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Fri May 2 12:50:58 2008 +0900 imm32: Updated implementation of the ImmGetCandidateListCount{A|W}. --- dlls/imm32/imm.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 590bccc..f382f2b 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -829,9 +829,30 @@ done: DWORD WINAPI ImmGetCandidateListCountA( HIMC hIMC, LPDWORD lpdwListCount) { - FIXME("(%p, %p): stub\n", hIMC, lpdwListCount); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + InputContextData *data = (InputContextData *)hIMC; + LPCANDIDATEINFO candinfo; + DWORD ret, count; + + TRACE("%p, %p\n", hIMC, lpdwListCount); + + if (!data || !lpdwListCount || !data->IMC.hCandInfo) + return 0; + + candinfo = ImmLockIMCC(data->IMC.hCandInfo); + + *lpdwListCount = count = candinfo->dwCount; + + if ( !is_himc_ime_unicode(data) ) + ret = candinfo->dwSize; + else + { + ret = sizeof(CANDIDATEINFO); + while ( count-- ) + ret += ImmGetCandidateListA(hIMC, count, NULL, 0); + } + + ImmUnlockIMCC(data->IMC.hCandInfo); + return ret; } /*********************************************************************** @@ -840,9 +861,30 @@ DWORD WINAPI ImmGetCandidateListCountA( DWORD WINAPI ImmGetCandidateListCountW( HIMC hIMC, LPDWORD lpdwListCount) { - FIXME("(%p, %p): stub\n", hIMC, lpdwListCount); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + InputContextData *data = (InputContextData *)hIMC; + LPCANDIDATEINFO candinfo; + DWORD ret, count; + + TRACE("%p, %p\n", hIMC, lpdwListCount); + + if (!data || !lpdwListCount || !data->IMC.hCandInfo) + return 0; + + candinfo = ImmLockIMCC(data->IMC.hCandInfo); + + *lpdwListCount = count = candinfo->dwCount; + + if ( is_himc_ime_unicode(data) ) + ret = candinfo->dwSize; + else + { + ret = sizeof(CANDIDATEINFO); + while ( count-- ) + ret += ImmGetCandidateListW(hIMC, count, NULL, 0); + } + + ImmUnlockIMCC(data->IMC.hCandInfo); + return ret; } /***********************************************************************

1 0

Roderick Colenbrander : ddraw: Enable EnableAutoDepthStencil to receive depth support.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: feb753c98d82e18b6dd1b1df7730c882974b643b URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb753c98d82e18b6dd1b1df7… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu May 1 23:46:03 2008 +0000 ddraw: Enable EnableAutoDepthStencil to receive depth support. --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 80c543c..7bf8047 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3108,7 +3108,7 @@ IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This, localParameters.SwapEffect = WINED3DSWAPEFFECT_COPY; localParameters.hDeviceWindow = window; localParameters.Windowed = !(This->cooperative_level & DDSCL_FULLSCREEN); - localParameters.EnableAutoDepthStencil = FALSE; + localParameters.EnableAutoDepthStencil = TRUE; localParameters.AutoDepthStencilFormat = WINED3DFMT_D16; localParameters.Flags = 0; localParameters.FullScreen_RefreshRateInHz = WINED3DPRESENT_RATE_DEFAULT; /* Default rate: It's already set */

1 0

James Hawkins : msi: A progid who is its own parent cannot have a clsid.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: 33c3bdeb03129bab41722104c6a40cea6666dd6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c3bdeb03129bab41722104c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri May 2 03:45:32 2008 -0500 msi: A progid who is its own parent cannot have a clsid. --- dlls/msi/classes.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index aca7c93..45254ef 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -971,6 +971,8 @@ static LPCWSTR get_clsid_of_progid( const MSIPROGID *progid ) { if (progid->Class) return progid->Class->clsid; + if (progid->Parent == progid) + break; progid = progid->Parent; } return NULL;

1 0

James Hawkins : ntdll: Fix two tests that fail on all NT platforms.
by Alexandre Julliard May 2, 2008

May 2, 2008

Module: wine Branch: master Commit: b779aac8cf1b95932e5c8a186586496f19f32e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b779aac8cf1b95932e5c8a186… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri May 2 03:12:43 2008 -0500 ntdll: Fix two tests that fail on all NT platforms. --- dlls/ntdll/tests/path.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 9d67b2c..99d9482 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -114,11 +114,9 @@ static void test_RtlIsDosDeviceName(void) { "c:nul. . . :", 4, 6 }, { "c:nul . . :", 4, 6 }, { "c:nul0", 0, 0 }, - { "c:prn:aaa", 0, 0 }, { "c:PRN:.txt", 4, 6 }, { "c:aux:.txt...", 4, 6 }, { "c:prn:.txt:", 4, 6 }, - { "c:nul:aaa", 0, 0 }, { "con:", 0, 6 }, { "lpt1:", 0, 8 }, { "c:com5:", 4, 8 }, @@ -147,6 +145,18 @@ static void test_RtlIsDosDeviceName(void) "Wrong result (%d,%d)/(%d,%d) for %s\n", HIWORD(ret), LOWORD(ret), test->pos, test->len, test->path ); } + + pRtlMultiByteToUnicodeN( buffer, sizeof(buffer), NULL, "c:prn:aaa", strlen("c:prn:aaa")+1 ); + ret = pRtlIsDosDeviceName_U( buffer ); + ok( ret == MAKELONG( 6, 4 ) || /* NT */ + ret == MAKELONG( 0, 0), /* win9x */ + "Wrong result (%d,%d)/(4,6) or (0,0) for c:prn:aaa\n", HIWORD(ret), LOWORD(ret) ); + + pRtlMultiByteToUnicodeN( buffer, sizeof(buffer), NULL, "c:nul:aaa", strlen("c:nul:aaa")+1 ); + ret = pRtlIsDosDeviceName_U( buffer ); + ok( ret == MAKELONG( 6, 4 ) || /* NT */ + ret == MAKELONG( 0, 0), /* win9x */ + "Wrong result (%d,%d)/(4,6) or (0,0) for c:nul:aaa\n", HIWORD(ret), LOWORD(ret) ); } static void test_RtlIsNameLegalDOS8Dot3(void)

1 0