November 2013 - Wine-commits

Huw Davies : riched20: Revert to the default paragraph style when all text is deleted.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 58e83ebdea14dbc3e4839b17ec4cbcd59fa67293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e83ebdea14dbc3e4839b17e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 4 14:23:53 2013 +0000 riched20: Revert to the default paragraph style when all text is deleted. --- dlls/riched20/caret.c | 7 +++++-- dlls/riched20/tests/editor.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index b39a8c7..fd7034d 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -284,13 +284,15 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, BOOL bForce) { ME_Cursor c = *start; - int nOfs = ME_GetCursorOfs(start); + int nOfs = ME_GetCursorOfs(start), text_len = ME_GetTextLength( editor ); int shift = 0; int totalChars = nChars; ME_DisplayItem *start_para; + BOOL delete_all = FALSE; /* Prevent deletion past last end of paragraph run. */ - nChars = min(nChars, ME_GetTextLength(editor) - nOfs); + nChars = min(nChars, text_len - nOfs); + if (nChars == text_len) delete_all = TRUE; start_para = c.pPara; if (!bForce) @@ -424,6 +426,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, continue; } } + if (delete_all) ME_SetDefaultParaFormat( start_para->member.para.pFmt ); return TRUE; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 3abd8d2..8ec5e9f 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7429,6 +7429,42 @@ static void test_WM_CREATE(void) DestroyWindow(rich_edit); } +/******************************************************************* + * Test that after deleting all of the text, the first paragraph + * format reverts to the default. + */ +static void test_reset_default_para_fmt( void ) +{ + HWND richedit = new_richeditW( NULL ); + PARAFORMAT2 fmt; + WORD def_align, new_align; + + memset( &fmt, 0, sizeof(fmt) ); + fmt.cbSize = sizeof(PARAFORMAT2); + fmt.dwMask = -1; + SendMessageA( richedit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + def_align = fmt.wAlignment; + new_align = (def_align == PFA_LEFT) ? PFA_RIGHT : PFA_LEFT; + + simulate_typing_characters( richedit, "123" ); + + SendMessageA( richedit, EM_SETSEL, 0, -1 ); + fmt.dwMask = PFM_ALIGNMENT; + fmt.wAlignment = new_align; + SendMessageA( richedit, EM_SETPARAFORMAT, 0, (LPARAM)&fmt ); + + SendMessageA( richedit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.wAlignment == new_align, "got %d expect %d\n", fmt.wAlignment, new_align ); + + SendMessageA( richedit, EM_SETSEL, 0, -1 ); + SendMessageA( richedit, WM_CUT, 0, 0 ); + + SendMessageA( richedit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.wAlignment == def_align, "got %d exppect %d\n", fmt.wAlignment, def_align ); + + DestroyWindow( richedit ); +} + START_TEST( editor ) { BOOL ret; @@ -7490,6 +7526,7 @@ START_TEST( editor ) test_EM_FINDWORDBREAK_A(); test_enter(); test_WM_CREATE(); + test_reset_default_para_fmt(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

André Hentschel : kernel32/tests: Test ResolveDelayLoadedAPI with generated dll.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: cb1806db264cc9b2794a030173f0011f30f626f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1806db264cc9b2794a03017… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 31 18:43:54 2013 +0100 kernel32/tests: Test ResolveDelayLoadedAPI with generated dll. --- dlls/kernel32/tests/loader.c | 265 +++++++++++++++++++++++++++++++++--------- 1 files changed, 211 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb1806db264cc9b2794a0…

1 0

Alexandre Julliard : explorer: Remove SWP_NOACTIVATE to ensure that the foreground window is set to the desktop .
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 1483bfa21d4945a1f62d957edafbd179cd518865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1483bfa21d4945a1f62d957ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 19:40:13 2013 +0100 explorer: Remove SWP_NOACTIVATE to ensure that the foreground window is set to the desktop. --- programs/explorer/desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index c3abe6d..1a8db99 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -839,7 +839,7 @@ void manage_desktop( WCHAR *arg ) if (name) set_desktop_window_title( hwnd, name ); SetWindowPos( hwnd, 0, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN), - SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); + SWP_SHOWWINDOW ); SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); ClipCursor( NULL ); initialize_display_settings();

1 0

Andrew Eikum : msadp32: Also convert to 8-bit PCM.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 39185814b1e51348d50458632f44e0756fba8426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39185814b1e51348d50458632… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 4 10:05:58 2013 -0600 msadp32: Also convert to 8-bit PCM. --- dlls/msadp32.acm/msadp32.c | 96 +++++++++++++++++++++++++++++--------------- 1 files changed, 64 insertions(+), 32 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index d76a2f8..59f71b5 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -223,6 +223,11 @@ static inline void process_nibble(unsigned nibble, int* idelta, if (*idelta < 16) *idelta = 16; } +static inline unsigned char C168(short s) +{ + return HIBYTE(s) ^ (unsigned char)0x80; +} + static void cvtSSms16K(const ACMDRVSTREAMINSTANCE *adsi, const unsigned char* src, LPDWORD nsrc, unsigned char* dst, LPDWORD ndst) @@ -234,10 +239,10 @@ static void cvtSSms16K(const ACMDRVSTREAMINSTANCE *adsi, int nsamp; int nsamp_blk = ((ADPCMWAVEFORMAT*)adsi->pwfxSrc)->wSamplesPerBlock; DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, - *ndst / (nsamp_blk * 2 * 2)); + *ndst / (nsamp_blk * adsi->pwfxDst->nBlockAlign)); *nsrc = nblock * adsi->pwfxSrc->nBlockAlign; - *ndst = nblock * nsamp_blk * 2 * 2; + *ndst = nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; nsamp_blk -= 2; /* see below for samples from block head */ for (; nblock > 0; nblock--) @@ -256,18 +261,34 @@ static void cvtSSms16K(const ACMDRVSTREAMINSTANCE *adsi, sample2L = R16(src); src += 2; sample2R = R16(src); src += 2; - /* store samples from block head */ - W16(dst, sample2L); dst += 2; - W16(dst, sample2R); dst += 2; - W16(dst, sample1L); dst += 2; - W16(dst, sample1R); dst += 2; - - for (nsamp = nsamp_blk; nsamp > 0; nsamp--) - { - process_nibble(*src >> 4, &ideltaL, &sample1L, &sample2L, &coeffL); - W16(dst, sample1L); dst += 2; - process_nibble(*src++ & 0x0F, &ideltaR, &sample1R, &sample2R, &coeffR); - W16(dst, sample1R); dst += 2; + if(adsi->pwfxDst->wBitsPerSample == 8){ + /* store samples from block head */ + *dst = C168(sample2L); ++dst; + *dst = C168(sample2R); ++dst; + *dst = C168(sample1L); ++dst; + *dst = C168(sample1R); ++dst; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp--) + { + process_nibble(*src >> 4, &ideltaL, &sample1L, &sample2L, &coeffL); + *dst = C168(sample1L); ++dst; + process_nibble(*src++ & 0x0F, &ideltaR, &sample1R, &sample2R, &coeffR); + *dst = C168(sample1R); ++dst; + } + }else if(adsi->pwfxDst->wBitsPerSample == 16){ + /* store samples from block head */ + W16(dst, sample2L); dst += 2; + W16(dst, sample2R); dst += 2; + W16(dst, sample1L); dst += 2; + W16(dst, sample1R); dst += 2; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp--) + { + process_nibble(*src >> 4, &ideltaL, &sample1L, &sample2L, &coeffL); + W16(dst, sample1L); dst += 2; + process_nibble(*src++ & 0x0F, &ideltaR, &sample1R, &sample2R, &coeffR); + W16(dst, sample1R); dst += 2; + } } src = in_src + adsi->pwfxSrc->nBlockAlign; } @@ -283,10 +304,10 @@ static void cvtMMms16K(const ACMDRVSTREAMINSTANCE *adsi, int nsamp; int nsamp_blk = ((ADPCMWAVEFORMAT*)adsi->pwfxSrc)->wSamplesPerBlock; DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, - *ndst / (nsamp_blk * 2)); + *ndst / (nsamp_blk * adsi->pwfxDst->nBlockAlign)); *nsrc = nblock * adsi->pwfxSrc->nBlockAlign; - *ndst = nblock * nsamp_blk * 2; + *ndst = nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; nsamp_blk -= 2; /* see below for samples from block head */ for (; nblock > 0; nblock--) @@ -301,16 +322,30 @@ static void cvtMMms16K(const ACMDRVSTREAMINSTANCE *adsi, sample2 = R16(src); src += 2; /* store samples from block head */ - W16(dst, sample2); dst += 2; - W16(dst, sample1); dst += 2; - - for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) - { - process_nibble(*src >> 4, &idelta, &sample1, &sample2, &coeff); - W16(dst, sample1); dst += 2; - process_nibble(*src++ & 0x0F, &idelta, &sample1, &sample2, &coeff); - W16(dst, sample1); dst += 2; + if(adsi->pwfxDst->wBitsPerSample == 8){ + *dst = C168(sample2); ++dst; + *dst = C168(sample1); ++dst; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) + { + process_nibble(*src >> 4, &idelta, &sample1, &sample2, &coeff); + *dst = C168(sample1); ++dst; + process_nibble(*src++ & 0x0F, &idelta, &sample1, &sample2, &coeff); + *dst = C168(sample1); ++dst; + } + }else if(adsi->pwfxDst->wBitsPerSample == 16){ + W16(dst, sample2); dst += 2; + W16(dst, sample1); dst += 2; + + for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) + { + process_nibble(*src >> 4, &idelta, &sample1, &sample2, &coeff); + W16(dst, sample1); dst += 2; + process_nibble(*src++ & 0x0F, &idelta, &sample1, &sample2, &coeff); + W16(dst, sample1); dst += 2; + } } + src = in_src + adsi->pwfxSrc->nBlockAlign; } } @@ -553,12 +588,9 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - /* resampling or mono <=> stereo not available - * ADPCM algo only define 16 bit per sample output - */ + /* resampling or mono <=> stereo not available */ if (adsi->pwfxSrc->nSamplesPerSec != adsi->pwfxDst->nSamplesPerSec || - adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || - adsi->pwfxDst->wBitsPerSample != 16) + adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels) goto theEnd; #if 0 @@ -577,9 +609,9 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) #endif /* adpcm decoding... */ - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) + if (adsi->pwfxDst->nChannels == 2) aad->convert = cvtSSms16K; - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) + else if (adsi->pwfxDst->nChannels == 1) aad->convert = cvtMMms16K; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM &&

1 0

Frédéric Delanoy : wordpad: Use BOOL type where appropriate.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 4ef76cd75c53682638390fd634467a4804a69355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef76cd75c53682638390fd63… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 2 14:34:15 2013 +0100 wordpad: Use BOOL type where appropriate. --- programs/wordpad/wordpad.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8468148..9eb0700 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1154,7 +1154,7 @@ static void dialog_viewproperties(void) static void HandleCommandLine(LPWSTR cmdline) { WCHAR delimiter; - int opt_print = 0; + BOOL opt_print = FALSE; /* skip white space */ while (*cmdline == ' ') cmdline++; @@ -1178,7 +1178,7 @@ static void HandleCommandLine(LPWSTR cmdline) { case 'P': case 'p': - opt_print = 1; + opt_print = TRUE; cmdline += 2; continue; }

1 0

Frédéric Delanoy : winhlp32: Use BOOL type where appropriate.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: a72c23ed0c5b8ccc8e7e71dbe8eaaa886eb5665b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a72c23ed0c5b8ccc8e7e71dbe… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 2 14:34:14 2013 +0100 winhlp32: Use BOOL type where appropriate. --- programs/winhlp32/hlpfile.c | 28 ++++++++++++++-------------- programs/winhlp32/hlpfile.h | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 3c49c33..adfee2f 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -763,7 +763,7 @@ static BOOL HLPFILE_RtfAddHexBytes(struct RtfData* rd, const void* _ptr, unsigne static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, const char* str, unsigned len, LONG hash, - unsigned clrChange, unsigned bHotSpot, unsigned wnd); + BOOL clrChange, BOOL bHotSpot, unsigned wnd); /****************************************************************** * HLPFILE_AddHotSpotLinks @@ -805,7 +805,7 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file, { case 0xC8: hslink = (HLPFILE_HOTSPOTLINK*) - HLPFILE_AllocLink(rd, hlp_link_macro, str, -1, 0, 0, 1, -1); + HLPFILE_AllocLink(rd, hlp_link_macro, str, -1, 0, FALSE, TRUE, -1); break; case 0xE6: @@ -813,7 +813,7 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file, hslink = (HLPFILE_HOTSPOTLINK*) HLPFILE_AllocLink(rd, (start[7 + 15 * i + 0] & 1) ? hlp_link_link : hlp_link_popup, file->lpszPath, -1, HLPFILE_Hash(str), - 0, 1, -1); + FALSE, TRUE, -1); break; case 0xEE: @@ -839,7 +839,7 @@ static void HLPFILE_AddHotSpotLinks(struct RtfData* rd, HLPFILE* file, } hslink = (HLPFILE_HOTSPOTLINK*) HLPFILE_AllocLink(rd, (start[7 + 15 * i + 0] & 1) ? hlp_link_link : hlp_link_popup, - file->lpszPath, -1, HLPFILE_Hash(tgt ? tgt : str), 0, 1, wnd); + file->lpszPath, -1, HLPFILE_Hash(tgt ? tgt : str), FALSE, TRUE, wnd); HeapFree(GetProcessHeap(), 0, tgt); break; } @@ -1162,7 +1162,7 @@ static BOOL HLPFILE_RtfAddGfxByIndex(struct RtfData* rd, HLPFILE *hlpfile, */ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, const char* str, unsigned len, LONG hash, - unsigned clrChange, unsigned bHotSpot, unsigned wnd) + BOOL clrChange, BOOL bHotSpot, unsigned wnd) { HLPFILE_LINK* link; char* link_str; @@ -1180,7 +1180,7 @@ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, memcpy(link_str, str, len); link_str[len] = '\0'; link->hash = hash; - link->bClrChange = clrChange ? 1 : 0; + link->bClrChange = clrChange; link->bHotSpot = bHotSpot; link->window = wnd; link->next = rd->first_link; @@ -1599,7 +1599,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0xCC: WINE_TRACE("macro => %s\n", format + 3); HLPFILE_AllocLink(rd, hlp_link_macro, (const char*)format + 3, - GET_USHORT(format, 1), 0, !(*format & 4), 0, -1); + GET_USHORT(format, 1), 0, !(*format & 4), FALSE, -1); format += 3 + GET_USHORT(format, 1); break; @@ -1607,7 +1607,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0xE1: WINE_WARN("jump topic 1 => %u\n", GET_UINT(format, 1)); HLPFILE_AllocLink(rd, (*format & 1) ? hlp_link_link : hlp_link_popup, - page->file->lpszPath, -1, GET_UINT(format, 1), 1, 0, -1); + page->file->lpszPath, -1, GET_UINT(format, 1), TRUE, FALSE, -1); format += 5; @@ -1619,7 +1619,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0xE7: HLPFILE_AllocLink(rd, (*format & 1) ? hlp_link_link : hlp_link_popup, page->file->lpszPath, -1, GET_UINT(format, 1), - !(*format & 4), 0, -1); + !(*format & 4), FALSE, -1); format += 5; break; @@ -1656,7 +1656,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, break; } HLPFILE_AllocLink(rd, (*format & 1) ? hlp_link_link : hlp_link_popup, - ptr, -1, GET_UINT(format, 4), !(*format & 4), 0, wnd); + ptr, -1, GET_UINT(format, 4), !(*format & 4), FALSE, wnd); } format += 3 + GET_USHORT(format, 1); break; @@ -1980,22 +1980,22 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) if (minor <= 16) { hlpfile->tbsize = 0x800; - hlpfile->compressed = 0; + hlpfile->compressed = FALSE; } else if (flags == 0) { hlpfile->tbsize = 0x1000; - hlpfile->compressed = 0; + hlpfile->compressed = FALSE; } else if (flags == 4) { hlpfile->tbsize = 0x1000; - hlpfile->compressed = 1; + hlpfile->compressed = TRUE; } else { hlpfile->tbsize = 0x800; - hlpfile->compressed = 1; + hlpfile->compressed = TRUE; } if (hlpfile->compressed) diff --git a/programs/winhlp32/hlpfile.h b/programs/winhlp32/hlpfile.h index 6b2e28a..c3fa4b0 100644 --- a/programs/winhlp32/hlpfile.h +++ b/programs/winhlp32/hlpfile.h @@ -124,9 +124,9 @@ typedef struct tagHlpFileFile unsigned short charset; unsigned short tbsize; /* topic block size */ unsigned short dsize; /* decompress size */ - unsigned short compressed; - unsigned hasPhrases; /* file has |Phrases */ - unsigned hasPhrases40; /* file has |PhrIndex/|PhrImage */ + BOOL compressed; + BOOL hasPhrases; /* file has |Phrases */ + BOOL hasPhrases40; /* file has |PhrIndex/|PhrImage */ UINT num_phrases; unsigned* phrases_offsets; char* phrases_buffer;

1 0

Frédéric Delanoy : uninstaller: Remove unused global variable.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: bc967a6e03b55cde1ec190f4d7dc67083205a658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc967a6e03b55cde1ec190f4d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 2 15:42:24 2013 +0100 uninstaller: Remove unused global variable. Not used since 393fd51f79784149bfe84613079523dd715a1bc5 --- programs/uninstaller/main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index e3178db..0a60c93 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -42,7 +42,6 @@ typedef struct { } uninst_entry; static uninst_entry *entries = NULL; static unsigned int numentries = 0; -static int list_need_update = 1; static int oldsel = -1; static WCHAR *sFilter; @@ -309,5 +308,4 @@ static void UninstallProgram(void) } } WINE_TRACE("finished uninstall phase.\n"); - list_need_update = 1; }

1 0

Michael Stefaniuc : winmm/tests: Use the explicit CreateEventW() and don' t bother testing it.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: a749f27ab311cfb4b84bf46bd33a889572bdd567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a749f27ab311cfb4b84bf46bd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 3 23:30:00 2013 +0100 winmm/tests: Use the explicit CreateEventW() and don't bother testing it. --- dlls/winmm/tests/capture.c | 7 +------ dlls/winmm/tests/mixer.c | 3 +-- dlls/winmm/tests/wave.c | 9 ++------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index d3d60db..b4d7170 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -130,7 +130,7 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format, DWORD flags, LPWAVEINCAPS pcaps) { HWAVEIN win; - HANDLE hevent; + HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR frag; MMRESULT rc; DWORD res; @@ -139,11 +139,6 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format, WORD wBitsPerSample = pwfx->wBitsPerSample; DWORD nSamplesPerSec = pwfx->nSamplesPerSec; - hevent=CreateEvent(NULL,FALSE,FALSE,NULL); - ok(hevent!=NULL,"CreateEvent(): error=%d\n",GetLastError()); - if (hevent==NULL) - return; - win=NULL; rc=waveInOpen(&win,device,pwfx,(DWORD_PTR)hevent,0,CALLBACK_EVENT|flags); /* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */ diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 2f483db..c00f9fc 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -1069,8 +1069,7 @@ static void test_mixerOpen(void) if (rc == MMSYSERR_NOERROR) test_mixerClose(mix); - event = CreateEvent(NULL, FALSE, FALSE, NULL); - ok(event != NULL, "CreateEvent(): error=%d\n", GetLastError()); + event = CreateEventW(NULL, FALSE, FALSE, NULL); /* NOTSUPPORTED is not broken, but it enables the todo_wine marker. */ rc = mixerOpen(&mix, d, (DWORD_PTR)event, 0, CALLBACK_EVENT); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 8e33b69..4b061ed 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -598,7 +598,7 @@ static void wave_out_test_deviceOut(int device, double duration, BOOL interactive, BOOL sine, BOOL pause) { HWAVEOUT wout; - HANDLE hevent; + HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR *frags = 0; MMRESULT rc; DWORD volume; @@ -616,11 +616,6 @@ static void wave_out_test_deviceOut(int device, double duration, DWORD frag_length; int i, j; - hevent=CreateEvent(NULL,FALSE,FALSE,NULL); - ok(hevent!=NULL,"CreateEvent(): error=%d\n",GetLastError()); - if (hevent==NULL) - return; - if ((flags & CALLBACK_TYPEMASK) == CALLBACK_EVENT) { callback = (DWORD_PTR)hevent; callback_instance = 0; @@ -1532,7 +1527,7 @@ static void test_fragmentsize(void) fmt.nAvgBytesPerSec = fmt.nBlockAlign * fmt.nSamplesPerSec; fmt.cbSize = sizeof(WAVEFORMATEX); - hevent = CreateEvent(NULL, FALSE, FALSE, NULL); + hevent = CreateEventW(NULL, FALSE, FALSE, NULL); g_tid = GetCurrentThreadId(); rc = waveOutOpen(&wout, WAVE_MAPPER, &fmt, (DWORD_PTR)callback_func,

1 0

Michael Stefaniuc : winmm/tests: Use a better type for the mixer object.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 36638ef5f86f19207d5d3f3791b170bf828be755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36638ef5f86f19207d5d3f379… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 3 23:34:00 2013 +0100 winmm/tests: Use a better type for the mixer object. --- dlls/winmm/tests/mixer.c | 103 +++++++++++++++++++-------------------------- 1 files changed, 44 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36638ef5f86f19207d5d3…

1 0

Michael Stefaniuc : winmm/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 6d7bd62a73842b5f9e2789673f6c635d08128a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7bd62a73842b5f9e2789673… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 3 23:36:24 2013 +0100 winmm/tests: Compile with -D__WINESRC__. --- dlls/winmm/tests/Makefile.in | 1 - dlls/winmm/tests/capture.c | 7 ++- dlls/winmm/tests/mci.c | 61 ++++++++++++++-------------- dlls/winmm/tests/mcicda.c | 4 +- dlls/winmm/tests/mmio.c | 90 +++++++++++++++++++++-------------------- dlls/winmm/tests/wave.c | 19 ++++----- 6 files changed, 91 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d7bd62a73842b5f9e278…

1 0