September 2008 - Wine-Commits

Muneyuki Noguchi : view: Add Japanese resources.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 3a6373d1a8942263453acad7f920c7357740bf78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a6373d1a8942263453acad7f… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Sep 6 22:46:14 2008 +0900 view: Add Japanese resources. --- programs/view/Ja.rc | 71 +++++++++++++++++++++++++++++++++++++++++++++++ programs/view/viewrc.rc | 1 + 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/programs/view/Ja.rc b/programs/view/Ja.rc new file mode 100644 index 0000000..b49ca8b --- /dev/null +++ b/programs/view/Ja.rc @@ -0,0 +1,71 @@ +/* + * View + * Japanese Language Support + * + * Copyright 1998 Douglas Ridgway + * Copyright 2003 Marcelo Duarte + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +/* + * + * Menu + * + */ + +VIEW MENU +BEGIN + POPUP "�t�@�C��(&F)" + BEGIN + MENUITEM "�J��(&O)", IDM_OPEN + MENUITEM "�I��(&X)", IDM_EXIT + END + POPUP "�p��(&P)" + BEGIN + MENUITEM "�E�B��h�E�ɍ��킹��(&S)", IDM_SET_EXT_TO_WIN + MENUITEM SEPARATOR + MENUITEM "��(&L)", IDM_LEFT + MENUITEM "�E(&R)", IDM_RIGHT + MENUITEM "��(&U)", IDM_UP + MENUITEM "��(&D)", IDM_DOWN + END +END + + +/* + * + * Accelerator + * + */ + +VIEW ACCELERATORS +BEGIN + "Q", IDM_EXIT, VIRTKEY, CONTROL +END + + +/* + * + * String Table + * + */ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "�W��^�t�@�C�� r��A�[" +END diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc index 67a0dea..18354fb 100644 --- a/programs/view/viewrc.rc +++ b/programs/view/viewrc.rc @@ -28,6 +28,7 @@ #include "Es.rc" #include "Fr.rc" #include "It.rc" +#include "Ja.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc"

1 0

Muneyuki Noguchi : wininet: Update Japanese translation.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 8d97c6e1abdf738f5f76648f37b0eb2d142bae6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d97c6e1abdf738f5f76648f3… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Sep 6 22:20:46 2008 +0900 wininet: Update Japanese translation. --- dlls/wininet/wininet_Ja.rc | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/wininet_Ja.rc b/dlls/wininet/wininet_Ja.rc index bcc8a73..766c042 100644 --- a/dlls/wininet/wininet_Ja.rc +++ b/dlls/wininet/wininet_Ja.rc @@ -20,7 +20,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "�l�b�g��[�N�p�X��[�h�̓��" +CAPTION "�l�b�g��[�N �p�X��[�h�̓��" FONT 9, "MS UI Gothic" { LTEXT "��[�U��ƃp�X��[�h��͂��ĉ��:", -1, 40, 6, 150, 15 @@ -37,3 +37,8 @@ FONT 9, "MS UI Gothic" PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "�L��Z��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "LAN �ڑ�" +}

1 0

Rob Shearman : rpcrt4: Change type of len parameter of NdrAllocate from size_t to SIZE_T.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: a8f7c716ef2c9558be75dc68773601060916bd25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f7c716ef2c9558be75dc687… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Sep 5 22:07:56 2008 +0100 rpcrt4: Change type of len parameter of NdrAllocate from size_t to SIZE_T. Use SIZE_T as it matches the size that Windows programs expect whereas size_t is platform-dependent. --- dlls/rpcrt4/ndr_marshall.c | 8 ++++---- include/rpcndr.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index bda04be..80e5b81 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -361,10 +361,10 @@ typedef struct _NDR_MEMORY_LIST * If the function is unable to allocate memory an ERROR_OUTOFMEMORY * exception is raised. */ -void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len) +void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, SIZE_T len) { - size_t aligned_len; - size_t adjusted_len; + SIZE_T aligned_len; + SIZE_T adjusted_len; void *p; NDR_MEMORY_LIST *mem_list; @@ -373,7 +373,7 @@ void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len) /* check for overflow */ if (adjusted_len < len) { - ERR("overflow of adjusted_len %d, len %d\n", adjusted_len, len); + ERR("overflow of adjusted_len %ld, len %ld\n", adjusted_len, len); RpcRaiseException(RPC_X_BAD_STUB_DATA); } diff --git a/include/rpcndr.h b/include/rpcndr.h index 7c0efaf..2503a3a 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -652,7 +652,7 @@ RPCRTAPI LONG RPC_ENTRY NdrDcomAsyncStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase ); RPCRTAPI void* RPC_ENTRY - NdrAllocate( PMIDL_STUB_MESSAGE pStubMsg, size_t Len ) __WINE_ALLOC_SIZE(2); + NdrAllocate( PMIDL_STUB_MESSAGE pStubMsg, SIZE_T Len ) __WINE_ALLOC_SIZE(2); RPCRTAPI void RPC_ENTRY NdrClearOutParameters( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, void *ArgAddr );

1 0

Vincent Povirk : user32: Use the correct bitmap location for MNS_CHECKORBMP .
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 3c4f44d1afee5adc956840c24d2b043334966030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c4f44d1afee5adc956840c24… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 4 15:38:43 2008 -0500 user32: Use the correct bitmap location for MNS_CHECKORBMP. --- dlls/user32/menu.c | 10 ++++++---- dlls/user32/tests/menu.c | 8 ++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 058cf0f..b7cfe1c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1504,11 +1504,13 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, bmprc.left = 3; else bmprc.left = lpitem->text ? menucharsize.cx : 0; - } else { - bmprc.left = 4; - if( !(menu->dwStyle & ( MNS_CHECKORBMP | MNS_NOCHECK))) - bmprc.left += GetSystemMetrics( SM_CXMENUCHECK); } + else if (menu->dwStyle & MNS_NOCHECK) + bmprc.left = 4; + else if (menu->dwStyle & MNS_CHECKORBMP) + bmprc.left = 2; + else + bmprc.left = 4 + GetSystemMetrics(SM_CXMENUCHECK); bmprc.right = bmprc.left + lpitem->bmpsize.cx; if( menuBar && !(lpitem->hbmpItem == HBMMENU_CALLBACK)) bmprc.top = 0; diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 5ccaba4..0eabe50 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -456,12 +456,8 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, expect = 4; else /* mnuopt == 2 */ expect = 2; - if (ispop && mnuopt == 2) - todo_wine ok( expect == MOD_rc[0].left, - "bitmap left is %d expected %d\n", MOD_rc[0].left, expect); - else - ok( expect == MOD_rc[0].left, - "bitmap left is %d expected %d\n", MOD_rc[0].left, expect); + ok( expect == MOD_rc[0].left, + "bitmap left is %d expected %d\n", MOD_rc[0].left, expect); failed = failed || !(expect == MOD_rc[0].left); /* vertical */ expect = (rc.bottom - rc.top - MOD_rc[0].bottom + MOD_rc[0].top) / 2;

1 0

Paul Vriens : winmm/tests: Fix a test on win9x.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: f4ba76e1d12418d79cd2cb207ff279513e64df7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ba76e1d12418d79cd2cb207… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Sep 6 14:16:19 2008 +0200 winmm/tests: Fix a test on win9x. --- dlls/winmm/tests/mmio.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e945891..f07ab8d 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -302,24 +302,24 @@ static void test_mmioOpen(char *fname) memset(&mmio, 0, sizeof(mmio)); mmio.fccIOProc = fname ? FOURCC_DOS : FOURCC_MEM; mmio.cchBuffer = 0; - mmio.pchBuffer = buf; + mmio.pchBuffer = NULL; hmmio = mmioOpen(fname, &mmio, MMIO_READ | MMIO_ALLOCBUF); ok(hmmio != 0, "mmioOpen error %u\n", mmio.wErrorRet); memset(&mmio, 0, sizeof(mmio)); ret = mmioGetInfo(hmmio, &mmio, 0); ok(ret == MMSYSERR_NOERROR, "mmioGetInfo error %u\n", ret); - ok(mmio.dwFlags == MMIO_READ, "expected MMIO_READ, got %x\n", mmio.dwFlags); + ok(mmio.dwFlags == (MMIO_READ|MMIO_ALLOCBUF), "expected MMIO_READ|MMIO_ALLOCBUF, got %x\n", mmio.dwFlags); ok(mmio.wErrorRet == MMSYSERR_NOERROR, "expected MMSYSERR_NOERROR, got %u\n", mmio.wErrorRet); ok(mmio.fccIOProc == (fname ? FOURCC_DOS : FOURCC_MEM), "got %4.4s\n", (LPCSTR)&mmio.fccIOProc); ok(mmio.cchBuffer == MMIO_DEFAULTBUFFER, "expected MMIO_DEFAULTBUFFER, got %u\n", mmio.cchBuffer); - ok(mmio.pchBuffer == buf, "expected %p, got %p\n", buf, mmio.pchBuffer); + ok(mmio.pchBuffer != NULL, "expected not NULL\n"); mmioClose(hmmio, 0); memset(&mmio, 0, sizeof(mmio)); mmio.fccIOProc = fname ? FOURCC_DOS : FOURCC_MEM; - mmio.cchBuffer = 0; + mmio.cchBuffer = 256; mmio.pchBuffer = NULL; hmmio = mmioOpen(fname, &mmio, MMIO_READ | MMIO_ALLOCBUF); ok(hmmio != 0, "mmioOpen error %u\n", mmio.wErrorRet); @@ -330,26 +330,32 @@ static void test_mmioOpen(char *fname) ok(mmio.dwFlags == (MMIO_READ|MMIO_ALLOCBUF), "expected MMIO_READ|MMIO_ALLOCBUF, got %x\n", mmio.dwFlags); ok(mmio.wErrorRet == MMSYSERR_NOERROR, "expected MMSYSERR_NOERROR, got %u\n", mmio.wErrorRet); ok(mmio.fccIOProc == (fname ? FOURCC_DOS : FOURCC_MEM), "got %4.4s\n", (LPCSTR)&mmio.fccIOProc); - ok(mmio.cchBuffer == MMIO_DEFAULTBUFFER, "expected MMIO_DEFAULTBUFFER, got %u\n", mmio.cchBuffer); + ok(mmio.cchBuffer == 256, "expected 256, got %u\n", mmio.cchBuffer); ok(mmio.pchBuffer != NULL, "expected not NULL\n"); mmioClose(hmmio, 0); memset(&mmio, 0, sizeof(mmio)); mmio.fccIOProc = fname ? FOURCC_DOS : FOURCC_MEM; - mmio.cchBuffer = 256; - mmio.pchBuffer = NULL; + mmio.cchBuffer = 0; + mmio.pchBuffer = buf; hmmio = mmioOpen(fname, &mmio, MMIO_READ | MMIO_ALLOCBUF); + if (!hmmio && mmio.wErrorRet == ERROR_BAD_FORMAT) + { + /* Seen on Win9x, WinMe but also XP-SP1 */ + skip("Some Windows versions don't like a 0 size and a given buffer\n"); + return; + } ok(hmmio != 0, "mmioOpen error %u\n", mmio.wErrorRet); memset(&mmio, 0, sizeof(mmio)); ret = mmioGetInfo(hmmio, &mmio, 0); ok(ret == MMSYSERR_NOERROR, "mmioGetInfo error %u\n", ret); - ok(mmio.dwFlags == (MMIO_READ|MMIO_ALLOCBUF), "expected MMIO_READ|MMIO_ALLOCBUF, got %x\n", mmio.dwFlags); + ok(mmio.dwFlags == MMIO_READ, "expected MMIO_READ, got %x\n", mmio.dwFlags); ok(mmio.wErrorRet == MMSYSERR_NOERROR, "expected MMSYSERR_NOERROR, got %u\n", mmio.wErrorRet); ok(mmio.fccIOProc == (fname ? FOURCC_DOS : FOURCC_MEM), "got %4.4s\n", (LPCSTR)&mmio.fccIOProc); - ok(mmio.cchBuffer == 256, "expected 256, got %u\n", mmio.cchBuffer); - ok(mmio.pchBuffer != NULL, "expected not NULL\n"); + ok(mmio.cchBuffer == MMIO_DEFAULTBUFFER, "expected MMIO_DEFAULTBUFFER, got %u\n", mmio.cchBuffer); + ok(mmio.pchBuffer == buf, "expected %p, got %p\n", buf, mmio.pchBuffer); mmioClose(hmmio, 0); }

1 0

Paul Vriens : crypt32/tests: Fix a test on Vista.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: e8b8856df0692412529a76a1a85a1ea814549d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b8856df0692412529a76a1a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Sep 6 14:15:54 2008 +0200 crypt32/tests: Fix a test on Vista. --- dlls/crypt32/tests/chain.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index ccb4cfc..45d45b8 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1612,14 +1612,18 @@ static void testGetCertChain(void) SetLastError(0xdeadbeef); ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, &chain); - ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_DATA || + GetLastError() == CRYPT_E_ASN1_BADTAG /* Vista */, + "Expected ERROR_INVALID_DATA or CRYPT_E_ASN1_BADTAG, got %d\n", GetLastError()); para.cbSize = sizeof(para); SetLastError(0xdeadbeef); ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, &chain); - ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_DATA || + GetLastError() == CRYPT_E_ASN1_BADTAG /* Vista */, + "Expected ERROR_INVALID_DATA or CRYPT_E_ASN1_BADTAG, got %d\n", GetLastError()); CertFreeCertificateContext(cert); for (i = 0; i < sizeof(chainCheck) / sizeof(chainCheck[0]); i++)

1 0

Paul Vriens : user32/tests: Win9x needs a threadid for CreateThread.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 3f6e4adf9d66d2dfe51fe14ecdf3c8fea28a6219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6e4adf9d66d2dfe51fe14ec… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Sep 8 08:07:08 2008 +0200 user32/tests: Win9x needs a threadid for CreateThread. --- dlls/user32/tests/menu.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 74cb2a0..5ccaba4 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1796,6 +1796,7 @@ static void test_menu_input(void) { WNDCLASSA wclass; HINSTANCE hInstance = GetModuleHandleA( NULL ); HANDLE hThread, hWnd; + DWORD tid; wclass.lpszClassName = "MenuTestClass"; wclass.style = CS_HREDRAW | CS_VREDRAW; @@ -1831,7 +1832,7 @@ static void test_menu_input(void) { ShowWindow(hWnd, SW_SHOW); UpdateWindow(hWnd); - hThread = CreateThread(NULL, 0, test_menu_input_thread, hWnd, 0, NULL); + hThread = CreateThread(NULL, 0, test_menu_input_thread, hWnd, 0, &tid); while(1) { if (WAIT_TIMEOUT != WaitForSingleObject(hThread, 50))

1 0

Paul Vriens : urlmon/tests: Fix timeouts for win9x tests.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: bdde87f04a8747c08474938bcef006d55a5c7081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdde87f04a8747c08474938bc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Sep 8 08:10:16 2008 +0200 urlmon/tests: Fix timeouts for win9x tests. --- dlls/urlmon/tests/protocol.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 638a0d7..d503721 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -871,6 +871,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, LPWSTR additional_headers = NULL; BYTE sec_id[100]; DWORD fetched = 0, size = 100; + DWORD tid; SET_EXPECT(GetBindString_USER_AGENT); hres = IInternetBindInfo_GetBindString(pOIBindInfo, BINDSTRING_USER_AGENT, @@ -927,7 +928,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IServiceProvider_Release(service_provider); - CreateThread(NULL, 0, thread_proc, NULL, 0, NULL); + CreateThread(NULL, 0, thread_proc, NULL, 0, &tid); return S_OK; }

1 0

Paul Vriens : kernel32/tests: Fix 2 tests on win9x.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: c461eba0672247e0a2c1c7decdfc69a7be483c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c461eba0672247e0a2c1c7dec… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Sep 8 07:58:27 2008 +0200 kernel32/tests: Fix 2 tests on win9x. --- dlls/kernel32/tests/module.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 3bda333..1fce13c 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -300,8 +300,9 @@ static void testLoadLibraryEx(void) SetLastError(0xdeadbeef); hmodule = LoadLibraryExA(path, NULL, LOAD_LIBRARY_AS_DATAFILE); ok(hmodule != 0, "Expected valid module handle\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_SUCCESS, /* win9x */ + "Expected 0xdeadbeef or ERROR_SUCCESS, got %d\n", GetLastError()); CloseHandle(hmodule); @@ -309,8 +310,9 @@ static void testLoadLibraryEx(void) SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("kernel32.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); ok(hmodule != 0, "Expected valid module handle\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_SUCCESS, /* win9x */ + "Expected 0xdeadbeef or ERROR_SUCCESS, got %d\n", GetLastError()); CloseHandle(hmodule);

1 0

Paul Vriens : kernel32/tests: Fix a few failures on win98.
by Alexandre Julliard Sept. 8, 2008

Sept. 8, 2008

Module: wine Branch: master Commit: 5737fb815c588327aa3325b95a30abd0768b5bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5737fb815c588327aa3325b95… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Sep 8 08:19:45 2008 +0200 kernel32/tests: Fix a few failures on win98. --- dlls/kernel32/tests/thread.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 5c3d99e..697f34b 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -372,6 +372,7 @@ static VOID test_CreateThread_basic(void) int error; DWORD i,j; DWORD GLE, ret; + DWORD tid; /* lstrlenA contains an exception handler so this makes sure exceptions work in the main thread */ ok( lstrlenA( (char *)0xdeadbeef ) == 0, "lstrlenA: unexpected success\n" ); @@ -429,7 +430,7 @@ static VOID test_CreateThread_basic(void) /* Test how passing NULL as a pointer to threadid works */ SetLastError(0xFACEaBAD); - thread[0] = CreateThread(NULL,0,threadFunc2,NULL,0,NULL); + thread[0] = CreateThread(NULL,0,threadFunc2,NULL,0,&tid); GLE = GetLastError(); if (thread[0]) { /* NT */ ok(GLE==0xFACEaBAD, "CreateThread set last error to %d, expected 4207848365\n", GLE); @@ -1125,7 +1126,7 @@ static DWORD WINAPI TLS_ThreadProc(LPVOID p) if (sync_threads_and_run_one(0, id)) { HANDLE thread; - DWORD waitret; + DWORD waitret, tid; val = TlsGetValue(TLS_index0); ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); @@ -1135,7 +1136,7 @@ static DWORD WINAPI TLS_ThreadProc(LPVOID p) ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); ok(val == (LPVOID) 2, "TLS slot not initialized correctly\n"); - thread = CreateThread(NULL, 0, TLS_InheritanceProc, 0, 0, NULL); + thread = CreateThread(NULL, 0, TLS_InheritanceProc, 0, 0, &tid); ok(thread != NULL, "CreateThread failed\n"); waitret = WaitForSingleObject(thread, 60000); ok(waitret == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); @@ -1173,7 +1174,9 @@ static void test_TLS(void) for (i = 0; i < 2; ++i) { - threads[i] = CreateThread(NULL, 0, TLS_ThreadProc, (LPVOID) i, 0, NULL); + DWORD tid; + + threads[i] = CreateThread(NULL, 0, TLS_ThreadProc, (LPVOID) i, 0, &tid); ok(threads[i] != NULL, "CreateThread failed\n"); } @@ -1221,7 +1224,8 @@ START_TEST(thread) while (1) { HANDLE hThread; - hThread = CreateThread(NULL, 0, threadFunc2, NULL, 0, NULL); + DWORD tid; + hThread = CreateThread(NULL, 0, threadFunc2, NULL, 0, &tid); ok(hThread != NULL, "CreateThread failed, error %u\n", GetLastError()); ok(WaitForSingleObject(hThread, 200) == WAIT_OBJECT_0,

1 0