November 2009 - Wine-commits

Jörg Höhle : mciwave/tests: Fix a few tests including one hang on Win9X.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: b04178eb01c3ff02057ce185e4d9659d3eebf7e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b04178eb01c3ff02057ce185e… Author: Jörg Höhle <Joerg-Cyril.Hoehle(a)t-systems.com> Date: Fri Nov 13 14:40:12 2009 +0100 mciwave/tests: Fix a few tests including one hang on Win9X. --- dlls/winmm/tests/mci.c | 102 +++++++++++++++++++++++++++++------------------ 1 files changed, 63 insertions(+), 39 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 90f6e3a..d1c7dab 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -25,6 +25,12 @@ #include "mmreg.h" #include "wine/test.h" +typedef union { + MCI_STATUS_PARMS status; + MCI_WAVE_SET_PARMS set; + MCI_WAVE_OPEN_PARMS open; + } MCI_PARMS_UNION; + static const char* dbg_mcierr(MCIERROR err) { switch (err) { @@ -165,15 +171,12 @@ static void test_openCloseWAVE(HWND hwnd) ok(!err,"mci %s returned error: %d\n", command_open, err); ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) - { - skip("Non-english locale (test with hardcoded 'milliseconds')\n"); - } - else - { - err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); - ok(!err,"mci status time format returned error: %d\n", err); - ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); + ok(!err,"mci status time format returned error: %d\n", err); + if(!err) { + if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) == LANG_ENGLISH) + ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); + else trace("locale-dependent time format: %s (ms)\n", buf); } err = mciSendString(command_close_my, NULL, 0, hwnd); @@ -198,6 +201,9 @@ static void test_openCloseWAVE(HWND hwnd) ok(!err,"mci %s returned error: %d\n", command_sysinfo, err); todo_wine ok(buf[0] == '0' && buf[1] == 0, "mci %s, expected output buffer '0', got: '%s'\n", command_sysinfo, buf); + err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_WAIT, 0); /* from MSDN */ + ok(!err,"mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, 0) returned %s\n", dbg_mcierr(err)); + err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, 0); ok(!err,"mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, 0) returned %s\n", dbg_mcierr(err)); @@ -214,11 +220,7 @@ static void test_recordWAVE(HWND hwnd) DWORD nsamp = 16000, expect; MCIERROR err; MCIDEVICEID wDeviceID; - union { - MCI_STATUS_PARMS status; - MCI_WAVE_SET_PARMS set; - MCI_WAVE_OPEN_PARMS open; - } parm; + MCI_PARMS_UNION parm; char buf[1024]; memset(buf, 0, sizeof(buf)); @@ -246,8 +248,11 @@ static void test_recordWAVE(HWND hwnd) err = mciSendString("set x format tag 2", NULL, 0, NULL); ok(err==MCIERR_OUTOFRANGE,"mci set format tag 2 returned error: %d\n", err); + /* MCI appears to scan the available devices for support of this format, + * returning MCIERR_OUTOFRANGE on machines with no sound. + * Don't skip here, record will fail below. */ err = mciSendString("set x format tag pcm", NULL, 0, NULL); - ok(!err,"mci set format tag pcm returned error: %d\n", err); + ok(!err || err==MCIERR_OUTOFRANGE,"mci set format tag pcm returned error: %d\n", err); /* Investigate: on w2k, set samplespersec 22050 sets nChannels to 2! * err = mciSendString("set x samplespersec 22050", NULL, 0, NULL); @@ -264,12 +269,16 @@ static void test_recordWAVE(HWND hwnd) MCI_WAVE_SET_SAMPLESPERSEC | MCI_WAVE_SET_CHANNELS | MCI_WAVE_SET_BITSPERSAMPLE | MCI_WAVE_SET_BLOCKALIGN | MCI_WAVE_SET_AVGBYTESPERSEC| MCI_WAVE_SET_FORMATTAG, (DWORD_PTR)&parm); - ok(!err,"mci returned error: %d\n", err); + ok(!err || err==MCIERR_OUTOFRANGE,"mciCommand set wave format returned error: %d\n", err); err = mciSendString("record x to 2000 wait", NULL, 0, hwnd); ok(!err,"mci record to 2000 returned error: %d\n", err); if(err==MCIERR_WAVE_INPUTSUNSUITABLE) { skip("Please install audio driver. Tests will fail\n"); + + err = mciSendString("close x", NULL, 0, NULL); + ok(!err,"mci close returned error: %d\n", err); + test_notification(hwnd,"record skipped",0); return; } @@ -315,15 +324,14 @@ static void test_playWAVE(HWND hwnd) { MCIERROR err; char buf[1024]; - memset(buf, 0, sizeof(buf)); - err = mciSendString("open waveaudio!tempfile.wav alias mysound", buf, sizeof(buf), NULL); - ok(!err,"mci open waveaudio!tempfile.wav returned error: %d\n", err); + + err = mciSendString("open waveaudio!tempfile.wav alias mysound", NULL, 0, NULL); + ok(!err,"mci open waveaudio!tempfile.wav returned %s\n", dbg_mcierr(err)); if(err) { - skip("tempfile.wav was not found (not saved), skipping\n"); + skip("Cannot open tempfile.wav for playing #1, skipping\n"); return; } - ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); err = mciSendString("status mysound length", buf, sizeof(buf), NULL); ok(!err,"mci status length returned error: %d\n", err); @@ -406,16 +414,21 @@ static void test_playWAVE(HWND hwnd) static void test_asyncWAVE(HWND hwnd) { + MCIDEVICEID wDeviceID; + MCI_PARMS_UNION parm; int err, p1, p2; char buf[1024]; memset(buf, 0, sizeof(buf)); - err = mciSendString("open tempfile.wav alias mysound", NULL, 0, NULL); - ok(!err,"mci open tempfile.wav returned error: %d\n", err); + err = mciSendString("open tempfile.wav alias mysound", buf, sizeof(buf), NULL); + ok(!err,"mci open tempfile.wav returned %s\n", dbg_mcierr(err)); if(err) { - skip("tempfile.wav was not found (not saved), skipping\n"); + skip("Cannot open tempfile.wav for playing #2, skipping\n"); return; } + ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); + wDeviceID = atoi(buf); + ok(wDeviceID,"mci open DeviceID: %d\n", wDeviceID); err = mciSendString("status mysound mode", buf, sizeof(buf), hwnd); ok(!err,"mci status mode returned error: %d\n", err); @@ -429,22 +442,20 @@ static void test_asyncWAVE(HWND hwnd) * will be 333ms, 667ms etc. at best. */ Sleep(100); /* milliseconds */ - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) - { - skip("Non-english locale (test with hardcoded 'milliseconds')\n"); - } - else - { - buf[0]=0; - err = mciSendString("status mysound time format", buf, sizeof(buf), hwnd); - ok(!err,"mci status time format returned error: %d\n", err); - ok(!strcmp(buf,"milliseconds"), "mci status time format: %s\n", buf); - } + /* Do not query time format as string because result depends on locale! */ + parm.status.dwItem = MCI_STATUS_TIME_FORMAT; + err = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&parm); + ok(!err,"mciCommand status time format returned error: %d\n",err); + if(!err) ok(parm.status.dwReturn==MCI_FORMAT_MILLISECONDS,"status time format: %ld\n",parm.status.dwReturn); + + parm.set.dwTimeFormat = MCI_FORMAT_MILLISECONDS; + err = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_TIME_FORMAT, (DWORD_PTR)&parm); + ok(!err,"mciCommand set time format returned error: %d\n",err); buf[0]=0; err = mciSendString("status mysound position", buf, sizeof(buf), hwnd); ok(!err,"mci status position returned error: %d\n", err); - ok(strcmp(buf,"2000"), "mci status position: %s\n", buf); + ok(strcmp(buf,"2000"), "mci status position: %s, expected 2000\n", buf); trace("position after Sleep: %sms\n",buf); p2 = atoi(buf); /* Some machines reach 79ms only during the 100ms sleep. */ @@ -597,11 +608,16 @@ static void test_AutoOpenWAVE(HWND hwnd) ok(!err,"mci sysinfo waveaudio quantity open returned error: %d\n", err); if(!err) todo_wine ok(!strcmp(buf,"0"), "sysinfo quantity open expected 0, got: %s\n", buf); + buf[0]=0; + err = mciSendString("sysinfo waveaudio name 1 open", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_OUTOFRANGE,"sysinfo waveaudio name 1 returned error: %d\n", err); + if(!err) trace("sysinfo dangling open alias: %s\n", buf); + err = mciSendString("play no-such-file-exists.wav notify", buf, sizeof(buf), NULL); if(err==MCIERR_FILE_NOT_FOUND) { - /* Unsupported auto-open leaves the file open, preventing clean-up */ - skip("Skipping auto-open tests in Wine\n"); - return; + /* Unsupported auto-open leaves the file open, preventing clean-up */ + skip("Skipping auto-open tests in Wine\n"); + return; } err = mciSendString("play tempfile.wav notify", buf, sizeof(buf), hwnd); @@ -610,6 +626,10 @@ static void test_AutoOpenWAVE(HWND hwnd) if(err) /* FIXME: don't open twice yet, it confuses Wine. */ err = mciSendString("play tempfile.wav", buf, sizeof(buf), hwnd); ok(!err,"mci auto-open play returned error: %d\n", err); + if(err==MCIERR_FILE_NOT_FOUND) { + skip("Cannot open tempfile.wav for auto-play, skipping\n"); + return; + } buf[0]=0; err = mciSendString("sysinfo waveaudio quantity open", buf, sizeof(buf), NULL); @@ -705,6 +725,7 @@ static void test_AutoOpenWAVE(HWND hwnd) START_TEST(mci) { + MCIERROR err; HWND hwnd; hwnd = CreateWindowExA(0, "static", "winmm test", WS_POPUP, 0,0,100,100, 0, 0, 0, NULL); @@ -713,6 +734,9 @@ START_TEST(mci) test_playWAVE(hwnd); test_asyncWAVE(hwnd); test_AutoOpenWAVE(hwnd); + /* Win9X hangs when exiting with something still open. */ + err = mciSendString("close all", NULL, 0, hwnd); + todo_wine ok(!err,"final close all returned %s\n", dbg_mcierr(err)); ok(DeleteFile("tempfile.wav"),"Delete tempfile.wav (cause auto-open?)\n"); DestroyWindow(hwnd); }

1 0

Hans Leidekker : msi: Test more variations of environment string prefixes.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 84ddfd8739a378dd3a1081eeb606725d21b8b83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ddfd8739a378dd3a1081eeb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 13 12:00:49 2009 +0100 msi: Test more variations of environment string prefixes. --- dlls/msi/tests/install.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 35bbc85..c6fd1ca 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -176,7 +176,11 @@ static const CHAR environment_dat[] = "Environment\tName\tValue\tComponent_\n" "Var3\t=-MSITESTVAR3\t1\tOne\n" "Var4\tMSITESTVAR4\t1\tOne\n" "Var5\t-MSITESTVAR5\t\tOne\n" - "Var6\tMSITESTVAR6\t\tOne\n"; + "Var6\tMSITESTVAR6\t\tOne\n" + "Var7\t!-MSITESTVAR7\t\tOne\n" + "Var8\t!-*MSITESTVAR8\t\tOne\n" + "Var9\t=-MSITESTVAR9\t\tOne\n" + "Var10\t=MSITESTVAR10\t\tOne\n"; static const CHAR condition_dat[] = "Feature_\tLevel\tCondition\n" "s38\ti2\tS255\n" @@ -6618,6 +6622,18 @@ static void test_envvar(void) res = RegDeleteValueA(env, "MSITESTVAR6"); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + res = RegDeleteValueA(env, "MSITESTVAR7"); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + res = RegDeleteValueA(env, "MSITESTVAR8"); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + res = RegDeleteValueA(env, "MSITESTVAR9"); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + res = RegDeleteValueA(env, "MSITESTVAR10"); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + RegCloseKey(env); delete_pf("msitest\\cabout\\new\\five.txt", TRUE);

1 0

Huw Davies : msctf/tests: Don' t convert past the end of a nul terminated string.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 625ec9f05f94329cd19bf28278248059b9ba372f URL: http://source.winehq.org/git/wine.git/?a=commit;h=625ec9f05f94329cd19bf2827… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 13 11:28:39 2009 +0000 msctf/tests: Don't convert past the end of a nul terminated string. Found by Valgrind. --- dlls/msctf/tests/inputprocessor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index f4f737f..c445b41 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1850,8 +1850,8 @@ static void enum_compartments(ITfCompartmentMgr *cmpmgr, REFGUID present, REFGUI { WCHAR str[50]; CHAR strA[50]; - StringFromGUID2(&g,str,50); - WideCharToMultiByte(CP_ACP,0,str,50,strA,50,0,0); + StringFromGUID2(&g,str,sizeof(str)/sizeof(str[0])); + WideCharToMultiByte(CP_ACP,0,str,-1,strA,sizeof(strA),0,0); trace("found %s\n",strA); if (present && IsEqualGUID(present,&g)) found = TRUE;

1 0

Huw Davies : gdi32/tests: Test the return value of GetClipBox before trying to access the rect.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 16c20d3c7374335f5e34093a8727ec6f3a802ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c20d3c7374335f5e34093a8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 13 12:01:23 2009 +0000 gdi32/tests: Test the return value of GetClipBox before trying to access the rect. --- dlls/gdi32/tests/metafile.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index a186608..b559901 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1953,8 +1953,11 @@ static void test_emf_clipping(void) SetRect(&rc_sclip, 100, 100, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); hrgn = CreateRectRgn(rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom); SelectClipRgn(hdc, hrgn); - GetClipBox(hdc, &rc_res); - todo_wine ok(EqualRect(&rc_res, &rc_sclip), + ret = GetClipBox(hdc, &rc_res); +todo_wine + ok(ret == SIMPLEREGION, "got %d\n", ret); + if(ret == SIMPLEREGION) + ok(EqualRect(&rc_res, &rc_sclip), "expected rc_res (%d, %d) - (%d, %d), got (%d, %d) - (%d, %d)\n", rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, rc_res.left, rc_res.top, rc_res.right, rc_res.bottom);

1 0

Roderick Colenbrander : wgl: None of the WGL_render_texture attribute values makes sense for GLX_X_RENDERABLE , so get rid of it.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: a46bd4bc9ff2dc3d9ddf56706d9feea8e69dcc88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46bd4bc9ff2dc3d9ddf56706… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Nov 13 12:24:10 2009 +0100 wgl: None of the WGL_render_texture attribute values makes sense for GLX_X_RENDERABLE, so get rid of it. --- dlls/winex11.drv/opengl.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 6171f9b..b680bb9 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -756,7 +756,6 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf ERR("trying to use WGL_render_texture Attributes without support (was %x)\n", iWGLAttr[cur]); return -1; /** error: don't support it */ } else { - PUSH2(oGLXAttr, GLX_X_RENDERABLE, pop); drawattrib |= GLX_PBUFFER_BIT; } }

1 0

Roderick Colenbrander : wgl: Make sure we set a valid value for GLX_DRAWABLE_TYPE. Right now we default to 0 which is illegal.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: e7590fcfb51bb149a6cf8272f5576861f2193183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7590fcfb51bb149a6cf8272f… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Nov 13 12:28:48 2009 +0100 wgl: Make sure we set a valid value for GLX_DRAWABLE_TYPE. Right now we default to 0 which is illegal. --- dlls/winex11.drv/opengl.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b680bb9..45da479 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -795,8 +795,10 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf ++cur; } - /* Apply the OR'd drawable type bitmask now EVEN when WGL_DRAW_TO* is unset. - * It is needed in all cases because GLX_DRAWABLE_TYPE default to GLX_WINDOW_BIT. */ + /* By default glXChooseFBConfig defaults to GLX_WINDOW_BIT. wglChoosePixelFormatARB searches through + * all formats. Unless drawattrib is set to a non-zero value override it with ~0, so that pixmap and pbuffer + * formats appear as well. */ + if(!drawattrib) drawattrib = ~0; PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, drawattrib); TRACE("pAttr[?] = GLX_DRAWABLE_TYPE: %#x\n", drawattrib);

1 0

Detlef Riekenberg : ntdll/tests: GetVolumePathnameW is not present before w2k.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 447e224380410ea008cec0cd25da2d97344afb55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=447e224380410ea008cec0cd2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Nov 12 23:42:53 2009 +0100 ntdll/tests: GetVolumePathnameW is not present before w2k. --- dlls/ntdll/tests/file.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ba6b07e..06e35b4 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -40,6 +40,8 @@ #define IO_COMPLETION_ALL_ACCESS 0x001F0003 #endif +static BOOL (WINAPI * pGetVolumePathNameW)(LPCWSTR, LPWSTR, DWORD); + static NTSTATUS (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); @@ -950,6 +952,12 @@ static void test_file_name_information(void) HANDLE h; UINT len; + /* GetVolumePathName is not present before w2k */ + if (!pGetVolumePathNameW) { + win_skip("GetVolumePathNameW not found\n"); + return; + } + file_name_size = GetSystemDirectoryW( NULL, 0 ); file_name = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*file_name) ); volume_prefix = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); @@ -960,7 +968,7 @@ static void test_file_name_information(void) "GetSystemDirectoryW returned %u, expected %u.\n", len, file_name_size - 1); - len = GetVolumePathNameW( file_name, volume_prefix, file_name_size ); + len = pGetVolumePathNameW( file_name, volume_prefix, file_name_size ); ok(len, "GetVolumePathNameW failed.\n"); len = lstrlenW( volume_prefix ); @@ -1018,6 +1026,7 @@ static void test_file_name_information(void) START_TEST(file) { + HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); HMODULE hntdll = GetModuleHandleA("ntdll.dll"); if (!hntdll) { @@ -1025,6 +1034,8 @@ START_TEST(file) return; } + pGetVolumePathNameW = (void *)GetProcAddress(hkernel32, "GetVolumePathNameW"); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U");

1 0

Huw Davies : msctf: Correctly initialize the description field.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: d775d6e31fa928efa2c9f8d3dca9736e77d243a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d775d6e31fa928efa2c9f8d3d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 12 22:51:10 2009 +0000 msctf: Correctly initialize the description field. Found by Valgrind. --- dlls/msctf/threadmgr.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 56f1c36..5f3a90a 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -883,6 +883,7 @@ static HRESULT WINAPI KeystrokeMgr_PreserveKey(ITfKeystrokeMgr *iface, newkey->guid = *rguid; newkey->prekey = *prekey; newkey->tid = tid; + newkey->description = NULL; if (cchDesc) { newkey->description = HeapAlloc(GetProcessHeap(),0,cchDesc * sizeof(WCHAR));

1 0

Owen Rudge : comctl32: Add basic structure for IImageList interface.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: a4f2ab9d14bb4ed76958a5405aa463c4569fb9e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f2ab9d14bb4ed76958a5405… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Nov 12 10:27:40 2009 -0600 comctl32: Add basic structure for IImageList interface. --- dlls/comctl32/Makefile.in | 2 +- dlls/comctl32/imagelist.c | 329 +++++++++++++++++++++++++++++++++++++++++++-- dlls/comctl32/imagelist.h | 32 +++-- 3 files changed, 338 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4f2ab9d14bb4ed76958a…

1 0

Owen Rudge : comctl32/tests: Add IImageList creation test.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 856dda32882f08a63c0456759c5af506d9de9c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=856dda32882f08a63c0456759… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Nov 12 10:27:44 2009 -0600 comctl32/tests: Add IImageList creation test. --- dlls/comctl32/tests/imagelist.c | 42 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 944e4ec..dd02c33 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -74,6 +74,9 @@ static HIMAGELIST (WINAPI *pImageList_Create)(int, int, UINT, int, int); static int (WINAPI *pImageList_Add)(HIMAGELIST, HBITMAP, HBITMAP); static BOOL (WINAPI *pImageList_DrawIndirect)(IMAGELISTDRAWPARAMS*); static BOOL (WINAPI *pImageList_SetImageCount)(HIMAGELIST,UINT); +static HRESULT (WINAPI *pImageList_CoCreateInstance)(REFCLSID,const IUnknown *, + REFIID,void **); +static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); static HDC desktopDC; static HINSTANCE hinst; @@ -1244,6 +1247,38 @@ cleanup: } } +static void test_iimagelist(void) +{ + IImageList *imgl; + HIMAGELIST himl; + HRESULT hr; + + if (!pImageList_CoCreateInstance || !pHIMAGELIST_QueryInterface) + { + win_skip("Vista imagelist functions not available\n"); + return; + } + + hr = pImageList_CoCreateInstance(&CLSID_ImageList, NULL, &IID_IImageList, (void **) &imgl); + ok(SUCCEEDED(hr), "ImageList_CoCreateInstance failed, hr=%x\n", hr); + + if (hr == S_OK) + IImageList_Release(imgl); + + himl = createImageList(32, 32); + + if (!himl) + return; + + hr = (pHIMAGELIST_QueryInterface)(himl, &IID_IImageList, (void **) &imgl); + ok(SUCCEEDED(hr), "HIMAGELIST_QueryInterface failed, hr=%x\n", hr); + + if (hr == S_OK) + IImageList_Release(imgl); + + ImageList_Destroy(himl); +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; @@ -1280,10 +1315,17 @@ START_TEST(imagelist) pImageList_Add = (void*)GetProcAddress(hComCtl32, "ImageList_Add"); pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); + pImageList_CoCreateInstance = (void*)GetProcAddress(hComCtl32, "ImageList_CoCreateInstance"); + pHIMAGELIST_QueryInterface = (void*)GetProcAddress(hComCtl32, "HIMAGELIST_QueryInterface"); + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); /* Do v6.0 tests */ test_ImageList_DrawIndirect(); test_shell_imagelist(); + test_iimagelist(); + + CoUninitialize(); unload_v6_module(ctx_cookie, hCtx); }

1 0