wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Jörg Höhle : winmm/tests: Introduce coherence tests among parts that may fail.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 11f07c6f6bba6f551c0be24acfeabb64b41c0ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f07c6f6bba6f551c0be24ac… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Nov 18 21:59:08 2009 +0100 winmm/tests: Introduce coherence tests among parts that may fail. --- dlls/winmm/tests/mci.c | 51 ++++++++++++++++++++++++++++++----------------- 1 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index bbf33bc..c72c81d 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -25,6 +25,10 @@ #include "mmreg.h" #include "wine/test.h" +/* The tests use the MCI's own save capability to create the tempfile.wav to play. + * To use a pre-existing file, write-protect it. */ +static MCIERROR ok_saved = MCIERR_FILE_NOT_FOUND; + typedef union { MCI_STATUS_PARMS status; MCI_WAVE_SET_PARMS set; @@ -244,7 +248,7 @@ static void test_recordWAVE(HWND hwnd) WORD nch = 1; WORD nbits = 16; DWORD nsamp = 16000, expect; - MCIERROR err; + MCIERROR err, ok_pcm; MCIDEVICEID wDeviceID; MCI_PARMS_UNION parm; char buf[1024]; @@ -289,9 +293,10 @@ static void test_recordWAVE(HWND hwnd) * Don't skip here, record will fail below. */ err = mciSendString("set x format tag pcm", NULL, 0, NULL); ok(!err || err==MCIERR_OUTOFRANGE,"mci set format tag pcm returned %s\n", dbg_mcierr(err)); + ok_pcm = err; err = mciSendString("set x samplespersec 41000 alignment 4 channels 2", NULL, 0, NULL); - ok(!err,"mci set samples+align+channels returned %s\n", dbg_mcierr(err)); + ok(err==ok_pcm,"mci set samples+align+channels returned %s\n", dbg_mcierr(err)); /* Investigate: on w2k, set samplespersec 22050 sets nChannels to 2! * err = mciSendString("set x samplespersec 22050", NULL, 0, NULL); @@ -308,12 +313,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 || err==MCIERR_OUTOFRANGE,"mciCommand set wave format: %s\n", dbg_mcierr(err)); + ok(err==ok_pcm,"mciCommand set wave format: %s\n", dbg_mcierr(err)); + /* A few ME machines pass all tests except set format tag pcm! */ err = mciSendString("record x to 2000 wait", NULL, 0, hwnd); - ok(!err,"mci record to 2000 returned %s\n", dbg_mcierr(err)); - if(err==MCIERR_WAVE_INPUTSUNSUITABLE) { - skip("Please install audio driver. Tests will fail\n"); + ok(err || !ok_pcm,"can record yet set wave format pcm returned %s\n", dbg_mcierr(ok_pcm)); + ok(!err || err==(ok_pcm==MCIERR_OUTOFRANGE ? MCIERR_WAVE_INPUTSUNSUITABLE : 0),"mci record to 2000 returned %s\n", dbg_mcierr(err)); + if(err) { + if (err==MCIERR_WAVE_INPUTSUNSUITABLE) + skip("Please install audio driver. Everything is skipped.\n"); + else skip("Cannot record cause %s. Everything is skipped.\n", dbg_mcierr(err)); err = mciSendString("close x", NULL, 0, NULL); ok(!err,"mci close returned %s\n", dbg_mcierr(err)); @@ -353,6 +362,7 @@ static void test_recordWAVE(HWND hwnd) err = mciSendString("save x tempfile.wav", NULL, 0, NULL); ok(!err,"mci save returned %s\n", dbg_mcierr(err)); + if(!err) ok_saved = 0; /* Save must not rename the original file. */ if (!DeleteFile("tempfile1.wav")) @@ -386,9 +396,9 @@ static void test_playWAVE(HWND hwnd) memset(buf, 0, sizeof(buf)); err = mciSendString("open waveaudio!tempfile.wav alias mysound", NULL, 0, NULL); - ok(!err,"mci open waveaudio!tempfile.wav returned %s\n", dbg_mcierr(err)); + ok(err==ok_saved,"mci open waveaudio!tempfile.wav returned %s\n", dbg_mcierr(err)); if(err) { - skip("Cannot open tempfile.wav for playing #1, skipping\n"); + skip("Cannot open waveaudio!tempfile.wav for playing (%s), skipping\n", dbg_mcierr(err)); return; } @@ -505,9 +515,9 @@ static void test_asyncWAVE(HWND hwnd) memset(buf, 0, sizeof(buf)); err = mciSendString("open tempfile.wav alias mysound", buf, sizeof(buf), NULL); - ok(!err,"mci open tempfile.wav returned %s\n", dbg_mcierr(err)); + ok(err==ok_saved,"mci open tempfile.wav returned %s\n", dbg_mcierr(err)); if(err) { - skip("Cannot open tempfile.wav for playing #2, skipping\n"); + skip("Cannot open tempfile.wav for playing (%s), skipping\n", dbg_mcierr(err)); return; } ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); @@ -685,7 +695,7 @@ static void test_AutoOpenWAVE(HWND hwnd) /* This test used(?) to cause intermittent crashes when Wine exits, after * fixme:winmm:MMDRV_Exit Closing while ll-driver open */ - MCIERROR err; + MCIERROR err, ok_snd; char buf[512], path[300], command[330]; memset(buf, 0, sizeof(buf)); memset(path, 0, sizeof(path)); @@ -697,11 +707,12 @@ static void test_AutoOpenWAVE(HWND hwnd) ok(!err,"mci sysinfo waveaudio quantity open returned %s\n", dbg_mcierr(err)); if(!err) todo_wine ok(!strcmp(buf,"0"), "sysinfo quantity open expected 0, got: %s, some more tests will fail.\n", buf); + ok_snd = waveOutGetNumDevs() ? 0 : MCIERR_HARDWARE; err = mciSendString("sound NoSuchSoundDefined wait", NULL, 0, NULL); - todo_wine ok(!err,"mci sound NoSuchSoundDefined returned %s\n", dbg_mcierr(err)); + todo_wine ok(err==ok_snd,"mci sound NoSuchSoundDefined returned %s\n", dbg_mcierr(err)); err = mciSendString("sound SystemExclamation notify wait", NULL, 0, hwnd); - todo_wine ok(!err,"mci sound SystemExclamation returned %s\n", dbg_mcierr(err)); + todo_wine ok(err==ok_snd,"mci sound SystemExclamation returned %s\n", dbg_mcierr(err)); test_notification(hwnd, "sound notify", err ? 0 : MCI_NOTIFY_SUCCESSFUL); buf[0]=0; @@ -710,7 +721,7 @@ static void test_AutoOpenWAVE(HWND hwnd) 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) { + if(err==MCIERR_FILE_NOT_FOUND) { /* a Wine detector */ /* Unsupported auto-open leaves the file open, preventing clean-up */ skip("Skipping auto-open tests in Wine\n"); return; @@ -721,7 +732,8 @@ 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 %s\n", dbg_mcierr(err)); + ok(err==ok_saved,"mci auto-open play returned %s\n", dbg_mcierr(err)); + if(err==MCIERR_FILE_NOT_FOUND) { skip("Cannot open tempfile.wav for auto-play, skipping\n"); return; @@ -771,8 +783,9 @@ static void test_AutoOpenWAVE(HWND hwnd) */ err = mciSendString("status tempfile.wav mode notify", buf, sizeof(buf), hwnd); todo_wine ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN, "mci status auto-open notify returned %s\n", dbg_mcierr(err)); - if(!err) { /* Wine style */ - trace("New style MCI auto-close upon notification behaviour.\n"); + if(!err) { + trace("Wine style MCI auto-close upon notification\n"); + /* "playing" because auto-close comes after the status call. */ todo_wine ok(!strcmp(buf,"playing"), "mci auto-open status mode notify, got: %s\n", buf); /* fixme:winmm:MMDRV_Exit Closing while ll-driver open @@ -782,7 +795,7 @@ static void test_AutoOpenWAVE(HWND hwnd) Sleep(16); test_notification(hwnd,"auto-open",0); } else if(err==MCIERR_NOTIFY_ON_AUTO_OPEN) { /* MS style */ - trace("Old style MCI auto-open forbids notification behaviour.\n"); + trace("MS style MCI auto-open forbids notification\n"); err = mciSendString("pause tempfile.wav", NULL, 0, hwnd); ok(!err,"mci auto-still-open pause returned %s\n", dbg_mcierr(err)); @@ -833,6 +846,6 @@ START_TEST(mci) /* 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"); + ok(DeleteFile("tempfile.wav")||ok_saved,"Delete tempfile.wav (cause auto-open?)\n"); DestroyWindow(hwnd); }

1 0

Paul Vriens : advapi32/tests: Fix test failures on Vista and higher for multiple runs.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: b5446ea525270b23af73e06a6c1c5a0b2ac2d57d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5446ea525270b23af73e06a6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 23 09:35:08 2009 +0100 advapi32/tests: Fix test failures on Vista and higher for multiple runs. --- dlls/advapi32/tests/eventlog.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 0186f2b..e71f823 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -769,9 +769,10 @@ static void test_readwrite(void) ok(ret, "Expected success : %d\n", GetLastError()); /* This will clear the eventlog. The record numbering for new - * events however differs on Vista+. Before Vista the first - * event would be numbered 1, on Vista+ it's now 2 as we already - * had one event. + * events however differs on Vista SP1+. Before Vista the first + * event would be numbered 1, on Vista SP1+ it's higher as we already + * had at least one event (more in case of multiple test runs without + * a reboot). */ ClearEventLogA(handle, NULL); CloseEventLog(handle); @@ -803,9 +804,9 @@ static void test_readwrite(void) ret = GetOldestEventLogRecord(handle, &oldest); ok(ret, "Expected success\n"); ok(oldest == 1 || - oldest == 2, /* Vista SP1, W2K8 and Win7 */ - "Expected oldest to be 1 or 2, got %d\n", oldest); - if (oldest == 2) + (oldest > 1 && oldest != 0xdeadbeef), /* Vista SP1+, W2K8 and Win7 */ + "Expected oldest to be 1 or higher, got %d\n", oldest); + if (oldest > 1 && oldest != 0xdeadbeef) on_vista = TRUE; if (i % 2) @@ -830,7 +831,7 @@ static void test_readwrite(void) /* Report only once */ if (on_vista) - skip("There is no DWORD alignment for UserSid on Vista, W2K8 or Win7\n"); + skip("There is no DWORD alignment enforced for UserSid on Vista, W2K8 or Win7\n"); /* Read all events from our created eventlog, one by one */ handle = OpenEventLogA(NULL, eventlogname); @@ -870,8 +871,8 @@ static void test_readwrite(void) ok(record->Reserved == 0x654c664c, "Expected 0x654c664c, got %d\n", record->Reserved); ok(record->RecordNumber == i + 1 || - (on_vista && (record->RecordNumber == i + 2)), - "Expected %d or %d, got %d\n", i + 1, i + 2, record->RecordNumber); + (on_vista && (record->RecordNumber > i + 1)), + "Expected %d or higher, got %d\n", i + 1, record->RecordNumber); ok(record->EventID == read_write[i].evt_id, "Expected %d, got %d\n", read_write[i].evt_id, record->EventID); ok(record->EventType == read_write[i].evt_type,

1 0

Marcus Meissner : uxtheme: Handle malformed keys a bit better (Coverity).
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 88bd52daafe15c948c436496c1cbb9ec133fed57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88bd52daafe15c948c436496c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 23 09:59:14 2009 +0100 uxtheme: Handle malformed keys a bit better (Coverity). --- dlls/uxtheme/msstyles.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 825645d..896a294 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -364,7 +364,10 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR lstrcpynW(part, comp, sizeof(part)/sizeof(part[0])); comp = tmp; /* now get the state */ - *strchrW(comp, ')') = 0; + tmp = strchrW(comp, ')'); + if (!tmp) + return FALSE; + *tmp = 0; lstrcpynW(state, comp, sizeof(state)/sizeof(state[0])); } else { @@ -378,7 +381,10 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR lstrcpynW(szClassName, comp, MAX_THEME_CLASS_NAME); comp = tmp; /* now get the state */ - *strchrW(comp, ')') = 0; + tmp = strchrW(comp, ')'); + if (!tmp) + return FALSE; + *tmp = 0; lstrcpynW(state, comp, sizeof(state)/sizeof(state[0])); } else {

1 0

Marcus Meissner : winspool.drv: Remove useless assignments without NULL ptr check (Coverity).
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 0dca1ebecf94ef44726c3bf83a059fee326f822c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dca1ebecf94ef44726c3bf83… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 23 09:48:03 2009 +0100 winspool.drv: Remove useless assignments without NULL ptr check (Coverity). --- dlls/winspool.drv/info.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7dac2b6..6d623d6 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3766,8 +3766,6 @@ static BOOL WINSPOOL_EnumPrinters(DWORD dwType, LPWSTR lpszName, dwType &= ~PRINTER_ENUM_CONNECTIONS; /* we don't handle that */ if (!dwType) { FIXME("We don't handle PRINTER_ENUM_CONNECTIONS\n"); - *lpdwNeeded = 0; - *lpdwReturned = 0; return TRUE; }

1 0

Marcus Meissner : msxml3: Fix NULL ptr checking in domdoc test (Coverity).
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 80995b684b7f39f1c8f96e7a2c17111b250d8af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80995b684b7f39f1c8f96e7a2… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 23 09:42:48 2009 +0100 msxml3: Fix NULL ptr checking in domdoc test (Coverity). --- dlls/msxml3/tests/domdoc.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d72452d..43a90d7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1030,6 +1030,10 @@ static void test_domnode( void ) CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); if( r != S_OK ) return; + if (!doc) { + ok( FALSE, "no document\n"); + return; + } b = FALSE; str = SysAllocString( szComplete4 ); @@ -1038,19 +1042,14 @@ static void test_domnode( void ) ok( b == VARIANT_TRUE, "failed to load XML string\n"); SysFreeString( str ); - if (doc) - { - b = 1; - r = IXMLDOMNode_hasChildNodes( doc, &b ); - ok( r == S_OK, "hasChildNoes bad return\n"); - ok( b == VARIANT_TRUE, "hasChildNoes wrong result\n"); + b = 1; + r = IXMLDOMNode_hasChildNodes( doc, &b ); + ok( r == S_OK, "hasChildNoes bad return\n"); + ok( b == VARIANT_TRUE, "hasChildNoes wrong result\n"); - r = IXMLDOMDocument_get_documentElement( doc, &element ); - ok( r == S_OK, "should be a document element\n"); - ok( element != NULL, "should be an element\n"); - } - else - ok( FALSE, "no document\n"); + r = IXMLDOMDocument_get_documentElement( doc, &element ); + ok( r == S_OK, "should be a document element\n"); + ok( element != NULL, "should be an element\n"); VariantInit(&var); ok( V_VT(&var) == VT_EMPTY, "variant init failed\n"); @@ -1439,8 +1438,7 @@ todo_wine if (element) IXMLDOMElement_Release( element ); - if (doc) - ok(IXMLDOMDocument_Release( doc ) == 0, "document is not destroyed\n"); + ok(IXMLDOMDocument_Release( doc ) == 0, "document is not destroyed\n"); } static void test_refs(void)

1 0

Sergey Khodych : comctl32/toolbar: Use proper button index when freeing a string in TOOLBAR_DeleteButton.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: fa7c2b5c5ffba17ce5849928c4e68296f4cd5f46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa7c2b5c5ffba17ce5849928c… Author: Sergey Khodych <khodych(a)gmail.com> Date: Sun Nov 22 22:37:19 2009 +0200 comctl32/toolbar: Use proper button index when freeing a string in TOOLBAR_DeleteButton. --- dlls/comctl32/toolbar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9481840..1cbdd6f 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3230,8 +3230,8 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex) (infoPtr->nNumButtons - nIndex) * sizeof(TBUTTON_INFO)); } - if (TOOLBAR_ButtonHasString(oldButtons)) - Free((LPWSTR)oldButtons->iString); + if (TOOLBAR_ButtonHasString(&oldButtons[nIndex])) + Free((LPWSTR)oldButtons[nIndex].iString); Free (oldButtons); }

1 0

Austin English : pdh: Add stubs for PdhExpandWildCardPathA/W.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 12da91b8dc35b53c46e923ebd5bfa88980fd09e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12da91b8dc35b53c46e923ebd… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Nov 22 12:28:33 2009 -0600 pdh: Add stubs for PdhExpandWildCardPathA/W. --- dlls/pdh/pdh.spec | 4 ++-- dlls/pdh/pdh_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 135692f..7486606 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -38,10 +38,10 @@ @ stub PdhEnumObjectsW @ stub PdhExpandCounterPathA @ stub PdhExpandCounterPathW -@ stub PdhExpandWildCardPathA +@ stdcall PdhExpandWildCardPathA(str str ptr ptr long) @ stub PdhExpandWildCardPathHA @ stub PdhExpandWildCardPathHW -@ stub PdhExpandWildCardPathW +@ stdcall PdhExpandWildCardPathW(wstr wstr ptr ptr long) @ stub PdhFormatFromRawValue @ stdcall PdhGetCounterInfoA(ptr long ptr ptr) @ stdcall PdhGetCounterInfoW(ptr long ptr ptr) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 9ca174b..7f08c92 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -600,6 +600,24 @@ PDH_STATUS WINAPI PdhCollectQueryDataWithTime( PDH_HQUERY handle, LONGLONG *time } /*********************************************************************** + * PdhExpandWildCardPathA (PDH.@) + */ +PDH_STATUS WINAPI PdhExpandWildCardPathA( LPCSTR szDataSource, LPCSTR szWildCardPath, LPSTR mszExpandedPathList, LPDWORD pcchPathListLength, DWORD dwFlags ) +{ + FIXME("%s, %s, %p, %p, 0x%x: stub\n", debugstr_a(szDataSource), debugstr_a(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PdhExpandWildCardPathW (PDH.@) + */ +PDH_STATUS WINAPI PdhExpandWildCardPathW( LPCWSTR szDataSource, LPCWSTR szWildCardPath, LPWSTR mszExpandedPathList, LPDWORD pcchPathListLength, DWORD dwFlags ) +{ + FIXME("%s, %s, %p, %p, 0x%x: stub\n", debugstr_w(szDataSource), debugstr_w(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** * PdhGetCounterInfoA (PDH.@) */ PDH_STATUS WINAPI PdhGetCounterInfoA( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD size, PPDH_COUNTER_INFO_A info )

1 0

Austin English : wordpad: Only allow one find/replace window.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 0b7903c46c831fd53dea20e9e78c001e4c96e4eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7903c46c831fd53dea20e9e… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Nov 22 12:19:26 2009 -0600 wordpad: Only allow one find/replace window. --- programs/wordpad/wordpad.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index e4e9ae0..e983c5d 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1281,6 +1281,13 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace) { static WCHAR findBuffer[MAX_STRING_LEN]; + /* Allow only one search/replace dialog to open */ + if(hFindWnd != NULL) + { + SetActiveWindow(hFindWnd); + return; + } + ZeroMemory(fr, sizeof(FINDREPLACEW)); fr->lStructSize = sizeof(FINDREPLACEW); fr->hwndOwner = hMainWnd;

1 0

Juan Lang : cryptnet: Improve CryptGetObjectUrl stub for URL_OID_CERTIFICATE_ISSUER.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 51eee4e7c9496e534a303a8b7bac8555fad298a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51eee4e7c9496e534a303a8b7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Nov 22 15:48:24 2009 -0800 cryptnet: Improve CryptGetObjectUrl stub for URL_OID_CERTIFICATE_ISSUER. --- dlls/cryptnet/cryptnet_main.c | 104 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 98 insertions(+), 6 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index a37c0d6..afae942 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -120,16 +120,108 @@ static const char *url_oid_to_str(LPCSTR oid) typedef BOOL (WINAPI *UrlDllGetObjectUrlFunc)(LPCSTR, LPVOID, DWORD, PCRYPT_URL_ARRAY, DWORD *, PCRYPT_URL_INFO, DWORD *, LPVOID); +static LPWSTR name_value_to_str(CERT_NAME_BLOB *name) +{ + DWORD len = CertNameToStrW(X509_ASN_ENCODING, name, CERT_SIMPLE_NAME_STR, + NULL, 0); + LPWSTR str = NULL; + + if (len) + { + str = CryptMemAlloc(len * sizeof(WCHAR)); + if (str) + CertNameToStrW(X509_ASN_ENCODING, name, CERT_SIMPLE_NAME_STR, + str, len); + } + return str; +} + +static void dump_alt_name_entry(CERT_ALT_NAME_ENTRY *entry) +{ + LPWSTR str; + + switch (entry->dwAltNameChoice) + { + case CERT_ALT_NAME_OTHER_NAME: + TRACE("CERT_ALT_NAME_OTHER_NAME, oid = %s\n", + debugstr_a(entry->u.pOtherName->pszObjId)); + break; + case CERT_ALT_NAME_RFC822_NAME: + TRACE("CERT_ALT_NAME_RFC822_NAME: %s\n", + debugstr_w(entry->u.pwszRfc822Name)); + break; + case CERT_ALT_NAME_DNS_NAME: + TRACE("CERT_ALT_NAME_DNS_NAME: %s\n", + debugstr_w(entry->u.pwszDNSName)); + break; + case CERT_ALT_NAME_DIRECTORY_NAME: + str = name_value_to_str(&entry->u.DirectoryName); + TRACE("CERT_ALT_NAME_DIRECTORY_NAME: %s\n", debugstr_w(str)); + CryptMemFree(str); + break; + case CERT_ALT_NAME_URL: + TRACE("CERT_ALT_NAME_URL: %s\n", debugstr_w(entry->u.pwszURL)); + break; + case CERT_ALT_NAME_IP_ADDRESS: + TRACE("CERT_ALT_NAME_IP_ADDRESS: %d bytes\n", + entry->u.IPAddress.cbData); + break; + case CERT_ALT_NAME_REGISTERED_ID: + TRACE("CERT_ALT_NAME_REGISTERED_ID: %s\n", + debugstr_a(entry->u.pszRegisteredID)); + break; + default: + TRACE("dwAltNameChoice = %d\n", entry->dwAltNameChoice); + } +} + static BOOL WINAPI CRYPT_GetUrlFromCertificateIssuer(LPCSTR pszUrlOid, LPVOID pvPara, DWORD dwFlags, PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, PCRYPT_URL_INFO pUrlInfo, DWORD *pcbUrlInfo, LPVOID pvReserved) { - /* FIXME: This depends on the AIA (authority info access) extension being - * supported in crypt32. - */ - FIXME("\n"); - SetLastError(CRYPT_E_NOT_FOUND); - return FALSE; + PCCERT_CONTEXT cert = pvPara; + PCERT_EXTENSION ext; + BOOL ret = FALSE; + + /* The only applicable flag is CRYPT_GET_URL_FROM_EXTENSION */ + if (dwFlags && !(dwFlags & CRYPT_GET_URL_FROM_EXTENSION)) + { + SetLastError(CRYPT_E_NOT_FOUND); + return FALSE; + } + if ((ext = CertFindExtension(szOID_AUTHORITY_INFO_ACCESS, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) + { + CERT_AUTHORITY_INFO_ACCESS *aia; + DWORD size; + + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_AUTHORITY_INFO_ACCESS, + ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, + &aia, &size); + if (ret) + { + DWORD i; + + TRACE("%d access descriptions:\n", aia->cAccDescr); + for (i = 0; i < aia->cAccDescr; i++) + { + if (!strcmp(aia->rgAccDescr[i].pszAccessMethod, + szOID_PKIX_OCSP)) + TRACE("OCSP:\n"); + else if (!strcmp(aia->rgAccDescr[i].pszAccessMethod, + szOID_PKIX_CA_ISSUERS)) + TRACE("CA issuers:\n"); + dump_alt_name_entry(&aia->rgAccDescr[i].AccessLocation); + } + LocalFree(aia); + FIXME("authority info access unsupported\n"); + SetLastError(CRYPT_E_NOT_FOUND); + ret = FALSE; + } + } + else + SetLastError(CRYPT_E_NOT_FOUND); + return ret; } static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid,

1 0

Nikolay Sivov : comctl32/listview: Add support for LVFI_SUBSTRING.
by Alexandre Julliard 23 Nov '09

23 Nov '09

Module: wine Branch: master Commit: 850ea2a7114e3e858af816399126e87b4098f2da URL: http://source.winehq.org/git/wine.git/?a=commit;h=850ea2a7114e3e858af816399… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Nov 22 10:59:45 2009 +0300 comctl32/listview: Add support for LVFI_SUBSTRING. --- dlls/comctl32/listview.c | 8 +++++--- dlls/comctl32/tests/listview.c | 29 +++++++++++++++++++++++++++++ include/commctrl.h | 11 ++++++----- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 448590a..5b45ffb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5888,7 +5888,8 @@ static INT LISTVIEW_FindItemW(const LISTVIEW_INFO *infoPtr, INT nStart, if (!lpFindInfo || nItem < 0) return -1; lvItem.mask = 0; - if (lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL)) + if (lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL) || + lpFindInfo->flags & LVFI_SUBSTRING) { lvItem.mask |= LVIF_TEXT; lvItem.pszText = szDispText; @@ -5952,7 +5953,7 @@ again: if (lvItem.mask & LVIF_TEXT) { - if (lpFindInfo->flags & LVFI_PARTIAL) + if (lpFindInfo->flags & (LVFI_PARTIAL | LVFI_SUBSTRING)) { WCHAR *p = strstrW(lvItem.pszText, lpFindInfo->psz); if (!p || p != lvItem.pszText) continue; @@ -6009,7 +6010,8 @@ again: static INT LISTVIEW_FindItemA(const LISTVIEW_INFO *infoPtr, INT nStart, const LVFINDINFOA *lpFindInfo) { - BOOL hasText = lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL); + BOOL hasText = lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL) || + lpFindInfo->flags & LVFI_SUBSTRING; LVFINDINFOW fiw; INT res; LPWSTR strW = NULL; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 55e7d96..95d9ddc 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4128,6 +4128,35 @@ static void test_finditem(void) r = SendMessage(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); expect(-1, r); + /* try with LVFI_SUBSTRING */ + strcpy(f, "fo"); + fi.flags = LVFI_SUBSTRING; + fi.psz = f; + r = SendMessage(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + if (r == -1) + { + win_skip("LVFI_SUBSTRING not supported\n"); + DestroyWindow(hwnd); + return; + } + expect(0, r); + strcpy(f, "f"); + fi.flags = LVFI_SUBSTRING; + fi.psz = f; + r = SendMessage(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + expect(0, r); + strcpy(f, "o"); + fi.flags = LVFI_SUBSTRING; + fi.psz = f; + r = SendMessage(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + expect(-1, r); + + strcpy(f, "f"); + fi.flags = LVFI_SUBSTRING | LVFI_STRING; + fi.psz = f; + r = SendMessage(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + expect(0, r); + DestroyWindow(hwnd); } diff --git a/include/commctrl.h b/include/commctrl.h index 4360925..b88d694 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3023,11 +3023,12 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVSICF_NOSCROLL 0x0002 -#define LVFI_PARAM 0X0001 -#define LVFI_STRING 0X0002 -#define LVFI_PARTIAL 0X0008 -#define LVFI_WRAP 0X0020 -#define LVFI_NEARESTXY 0X0040 +#define LVFI_PARAM 0x0001 +#define LVFI_STRING 0x0002 +#define LVFI_SUBSTRING 0x0004 +#define LVFI_PARTIAL 0x0008 +#define LVFI_WRAP 0x0020 +#define LVFI_NEARESTXY 0x0040 #define LVIF_TEXT 0x0001 #define LVIF_IMAGE 0x0002

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009