February 2013 - Wine-Commits

Jörg Höhle : mmsystem: Always use CALLBACK_FUNCTION to update MIDI/WAVEHDR.dwFlags.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: f13394f7979d26def92afc2a7399c174147f4c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13394f7979d26def92afc2a7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Feb 23 17:29:59 2013 +0100 mmsystem: Always use CALLBACK_FUNCTION to update MIDI/WAVEHDR.dwFlags. --- dlls/mmsystem.dll16/mmsystem.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index ac9915f..fe8f587 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -734,8 +734,7 @@ UINT16 WINAPI midiOutOpen16(HMIDIOUT16* lphMidiOut, UINT16 uDeviceID, { return MMSYSERR_NOMEM; } - if ((dwFlags & CALLBACK_TYPEMASK) != CALLBACK_NULL) - dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; ret = midiOutOpen(&hmo, uDeviceID, (DWORD)thunk, dwInstance, dwFlags); if (ret == MMSYSERR_NOERROR) { @@ -938,8 +937,7 @@ UINT16 WINAPI midiInOpen16(HMIDIIN16* lphMidiIn, UINT16 uDeviceID, { return MMSYSERR_NOMEM; } - if ((dwFlags & CALLBACK_TYPEMASK) != CALLBACK_NULL) - dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; ret = midiInOpen(&hmid, uDeviceID, (DWORD)thunk, dwInstance, dwFlags); if (ret == MMSYSERR_NOERROR) { @@ -1099,8 +1097,7 @@ MMRESULT16 WINAPI midiStreamOpen16(HMIDISTRM16* phMidiStrm, LPUINT16 devid, { return MMSYSERR_NOMEM; } - if ((fdwOpen & CALLBACK_TYPEMASK) != CALLBACK_NULL) - fdwOpen = (fdwOpen & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + fdwOpen = (fdwOpen & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; ret = midiStreamOpen(&hMidiStrm32, &devid32, cMidi, (DWORD)thunk, dwInstance, fdwOpen); if (ret == MMSYSERR_NOERROR) { @@ -1233,8 +1230,7 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16* lphWaveOut, UINT16 uDeviceID, { return MMSYSERR_NOMEM; } - if ((dwFlags & CALLBACK_TYPEMASK) != CALLBACK_NULL) - dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; /* since layout of WAVEFORMATEX is the same for 16/32 bits, we directly * call the 32 bit version * however, we need to promote correctly the wave mapper id @@ -1243,11 +1239,12 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16* lphWaveOut, UINT16 uDeviceID, ret = waveOutOpen(&hWaveOut, (uDeviceID == (UINT16)-1) ? (UINT)-1 : uDeviceID, lpFormat, (DWORD)thunk, dwInstance, dwFlags); - if (lphWaveOut != NULL && ret == MMSYSERR_NOERROR) - *lphWaveOut = HWAVEOUT_16(hWaveOut); if (ret == MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY)) + { MMSYSTDRV_SetHandle(thunk, (void*)hWaveOut); - else MMSYSTDRV_DeleteThunk(thunk); + if (lphWaveOut != NULL) + *lphWaveOut = HWAVEOUT_16(hWaveOut); + } else MMSYSTDRV_DeleteThunk(thunk); return ret; } @@ -1512,8 +1509,7 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16* lphWaveIn, UINT16 uDeviceID, { return MMSYSERR_NOMEM; } - if ((dwFlags & CALLBACK_TYPEMASK) != CALLBACK_NULL) - dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; /* since layout of WAVEFORMATEX is the same for 16/32 bits, we directly * call the 32 bit version * however, we need to promote correctly the wave mapper id @@ -1522,11 +1518,12 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16* lphWaveIn, UINT16 uDeviceID, ret = waveInOpen(&hWaveIn, (uDeviceID == (UINT16)-1) ? (UINT)-1 : uDeviceID, lpFormat, (DWORD)thunk, dwInstance, dwFlags); - if (lphWaveIn != NULL && ret == MMSYSERR_NOERROR) - *lphWaveIn = HWAVEIN_16(hWaveIn); if (ret == MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY)) + { MMSYSTDRV_SetHandle(thunk, (void*)hWaveIn); - else MMSYSTDRV_DeleteThunk(thunk); + if (lphWaveIn != NULL) + *lphWaveIn = HWAVEOUT_16(hWaveIn); + } else MMSYSTDRV_DeleteThunk(thunk); return ret; }

1 0

Hans Leidekker : msi: Handle more than one patch per file.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: aeb7d70ffdbb40c62beede410eefac9c776a2443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb7d70ffdbb40c62beede410… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 27 12:30:37 2013 +0100 msi: Handle more than one patch per file. --- dlls/msi/action.c | 12 ------------ dlls/msi/files.c | 19 +++++++++++++------ dlls/msi/msipriv.h | 1 - 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d48ecdd..827a0c8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -684,18 +684,6 @@ MSIFILE *msi_get_loaded_file( MSIPACKAGE *package, const WCHAR *key ) return NULL; } -MSIFILEPATCH *msi_get_loaded_filepatch( MSIPACKAGE *package, const WCHAR *key ) -{ - MSIFILEPATCH *patch; - - /* FIXME: There might be more than one patch */ - LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) - { - if (!strcmpW( key, patch->File->File )) return patch; - } - return NULL; -} - MSIFOLDER *msi_get_loaded_folder( MSIPACKAGE *package, const WCHAR *dir ) { MSIFOLDER *folder; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 7202fb6..96584df 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -443,6 +443,17 @@ static void unload_mspatch(void) FreeLibrary(hmspatcha); } +static MSIFILEPATCH *get_next_filepatch( MSIPACKAGE *package, const WCHAR *key ) +{ + MSIFILEPATCH *patch; + + LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) + { + if (!patch->IsApplied && !strcmpW( key, patch->File->File )) return patch; + } + return NULL; +} + static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { @@ -455,12 +466,8 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (temp_folder[0] == '\0') GetTempPathW(MAX_PATH, temp_folder); - p = msi_get_loaded_filepatch(package, file); - if (!p) - { - TRACE("unknown file in cabinet (%s)\n", debugstr_w(file)); - return FALSE; - } + if (!(p = get_next_filepatch(package, file))) return FALSE; + GetTempFileNameW(temp_folder, NULL, 0, patch_path); *path = strdupW(patch_path); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index c477405..018f405 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1018,7 +1018,6 @@ extern void msi_reset_folders( MSIPACKAGE *package, BOOL source ) DECLSPEC_HIDDE extern MSICOMPONENT *msi_get_loaded_component(MSIPACKAGE *package, const WCHAR *Component) DECLSPEC_HIDDEN; extern MSIFEATURE *msi_get_loaded_feature(MSIPACKAGE *package, const WCHAR *Feature) DECLSPEC_HIDDEN; extern MSIFILE *msi_get_loaded_file(MSIPACKAGE *package, const WCHAR *file) DECLSPEC_HIDDEN; -extern MSIFILEPATCH *msi_get_loaded_filepatch(MSIPACKAGE* package, const WCHAR *key) DECLSPEC_HIDDEN; extern MSIFOLDER *msi_get_loaded_folder(MSIPACKAGE *package, const WCHAR *dir) DECLSPEC_HIDDEN; extern int msi_track_tempfile(MSIPACKAGE *package, const WCHAR *path) DECLSPEC_HIDDEN; extern void msi_free_action_script(MSIPACKAGE *package, UINT script) DECLSPEC_HIDDEN;

1 0

Byeongsik Jeon : gdi32: Fix the GdiGetCodePage() support ANSI_CHARSET font associated charset.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 1c846e70f0edce2908e05a48fb78442a97ac67cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c846e70f0edce2908e05a48f… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Feb 26 10:31:20 2013 +0900 gdi32: Fix the GdiGetCodePage() support ANSI_CHARSET font associated charset. --- dlls/gdi32/font.c | 55 ++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 46 +++++++++++++++++++++++++ dlls/gdi32/tests/font.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b274b83..65e09d3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -590,11 +590,66 @@ HFONT WINAPI CreateFontW( INT height, INT width, INT esc, return CreateFontIndirectW( &logfont ); } +#define ASSOC_CHARSET_OEM 1 +#define ASSOC_CHARSET_ANSI 2 +#define ASSOC_CHARSET_SYMBOL 4 + +static DWORD get_associated_charset_info(void) +{ + static DWORD associated_charset = -1; + + if (associated_charset == -1) + { + static const WCHAR assoc_charset_reg_keyW[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','F','o','n','t','A','s','s','o','c','\\', + 'A','s','s','o','c','i','a','t','e','d',' ','C','h','a','r','s','e','t','\0'}; + static const WCHAR ansiW[] = {'A','N','S','I','(','0','0',')','\0'}; + static const WCHAR oemW[] = {'O','E','M','(','F','F',')','\0'}; + static const WCHAR symbolW[] = {'S','Y','M','B','O','L','(','0','2',')','\0'}; + static const WCHAR yesW[] = {'Y','E','S','\0'}; + HKEY hkey; + WCHAR dataW[32]; + DWORD type, data_len; + + associated_charset = 0; + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, + assoc_charset_reg_keyW, &hkey) != ERROR_SUCCESS) + return 0; + + data_len = sizeof(dataW); + if (!RegQueryValueExW(hkey, ansiW, NULL, &type, (LPBYTE)dataW, &data_len) && + type == REG_SZ && !strcmpiW(dataW, yesW)) + associated_charset |= ASSOC_CHARSET_ANSI; + + data_len = sizeof(dataW); + if (!RegQueryValueExW(hkey, oemW, NULL, &type, (LPBYTE)dataW, &data_len) && + type == REG_SZ && !strcmpiW(dataW, yesW)) + associated_charset |= ASSOC_CHARSET_OEM; + + data_len = sizeof(dataW); + if (!RegQueryValueExW(hkey, symbolW, NULL, &type, (LPBYTE)dataW, &data_len) && + type == REG_SZ && !strcmpiW(dataW, yesW)) + associated_charset |= ASSOC_CHARSET_SYMBOL; + + RegCloseKey(hkey); + + TRACE("associated_charset = %d\n", associated_charset); + } + + return associated_charset; +} + static void update_font_code_page( DC *dc ) { CHARSETINFO csi; int charset = GetTextCharsetInfo( dc->hSelf, NULL, 0 ); + if (charset == ANSI_CHARSET && + get_associated_charset_info() & ASSOC_CHARSET_ANSI) + charset = DEFAULT_CHARSET; + /* Hmm, nicely designed api this one! */ if (TranslateCharsetInfo( ULongToPtr(charset), &csi, TCI_SRCCHARSET) ) dc->font_code_page = csi.ciACP; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b977b0d..d7cc777 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3505,6 +3505,46 @@ static void set_value_key(HKEY hkey, const char *name, const char *value) RegDeleteValueA(hkey, name); } +static void update_font_association_info(UINT current_ansi_codepage) +{ + static const char *font_assoc_reg_key = "System\\CurrentControlSet\\Control\\FontAssoc"; + static const char *assoc_charset_subkey = "Associated Charset"; + + if (is_dbcs_ansi_cp(current_ansi_codepage)) + { + HKEY hkey; + if (RegCreateKeyA(HKEY_LOCAL_MACHINE, font_assoc_reg_key, &hkey) == ERROR_SUCCESS) + { + HKEY hsubkey; + if (RegCreateKeyA(hkey, assoc_charset_subkey, &hsubkey) == ERROR_SUCCESS) + { + switch (current_ansi_codepage) + { + case 932: + set_value_key(hsubkey, "ANSI(00)", "NO"); + set_value_key(hsubkey, "OEM(FF)", "NO"); + set_value_key(hsubkey, "SYMBOL(02)", "NO"); + break; + case 936: + case 949: + case 950: + set_value_key(hsubkey, "ANSI(00)", "YES"); + set_value_key(hsubkey, "OEM(FF)", "YES"); + set_value_key(hsubkey, "SYMBOL(02)", "NO"); + break; + } + RegCloseKey(hsubkey); + } + + /* TODO: Associated DefaultFonts */ + + RegCloseKey(hkey); + } + } + else + RegDeleteTreeA(HKEY_LOCAL_MACHINE, font_assoc_reg_key); +} + static void update_font_info(void) { static const WCHAR logpixels[] = { 'L','o','g','P','i','x','e','l','s',0 }; @@ -3538,6 +3578,7 @@ static void update_font_info(void) if (is_dbcs_ansi_cp(ansi_cp)) use_default_fallback = TRUE; + buf[0] = 0; len = sizeof(buf); if (RegQueryValueExA(hkey, "Codepages", 0, &type, (BYTE *)buf, &len) == ERROR_SUCCESS && type == REG_SZ) { @@ -3615,6 +3656,11 @@ static void update_font_info(void) } if (!done) FIXME("there is no font defaults for codepages %u,%u\n", ansi_cp, oem_cp); + + /* update locale dependent font association info in registry. + update only when codepages changed, not logpixels. */ + if (strcmp(buf, cpbuf) != 0) + update_font_association_info(ansi_cp); } static BOOL init_freetype(void) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 943f584..b72a423 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2083,6 +2083,90 @@ static void test_font_charset(void) skip("Symbol or Wingdings is not installed\n"); } +static void test_GdiGetCodePage(void) +{ + static const struct _matching_data + { + UINT current_codepage; + LPCSTR lfFaceName; + UCHAR lfCharSet; + UINT expected_codepage; + } matching_data[] = { + {1251, "Arial", ANSI_CHARSET, 1252}, + {1251, "Tahoma", ANSI_CHARSET, 1252}, + + {1252, "Arial", ANSI_CHARSET, 1252}, + {1252, "Tahoma", ANSI_CHARSET, 1252}, + + {1253, "Arial", ANSI_CHARSET, 1252}, + {1253, "Tahoma", ANSI_CHARSET, 1252}, + + { 932, "Arial", ANSI_CHARSET, 1252}, /* Japanese Windows returns 1252, not 932 */ + { 932, "Tahoma", ANSI_CHARSET, 1252}, + { 932, "MS UI Gothic", ANSI_CHARSET, 1252}, + + { 936, "Arial", ANSI_CHARSET, 936}, + { 936, "Tahoma", ANSI_CHARSET, 936}, + { 936, "Simsun", ANSI_CHARSET, 936}, + + { 949, "Arial", ANSI_CHARSET, 949}, + { 949, "Tahoma", ANSI_CHARSET, 949}, + { 949, "Gulim", ANSI_CHARSET, 949}, + + { 950, "Arial", ANSI_CHARSET, 950}, + { 950, "Tahoma", ANSI_CHARSET, 950}, + { 950, "PMingLiU", ANSI_CHARSET, 950}, + }; + HDC hdc; + LOGFONT lf; + HFONT hfont; + UINT charset, acp; + DWORD codepage; + int i; + + if (!pGdiGetCodePage) + { + skip("GdiGetCodePage not available on this platform\n"); + return; + } + + acp = GetACP(); + + for (i = 0; i < sizeof(matching_data) / sizeof(struct _matching_data); i++) + { + /* only test data matched current locale codepage */ + if (matching_data[i].current_codepage != acp) + continue; + + if (!is_font_installed(matching_data[i].lfFaceName)) + { + skip("%s is not installed\n", matching_data[i].lfFaceName); + continue; + } + + hdc = GetDC(0); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -16; + lf.lfCharSet = matching_data[i].lfCharSet; + lstrcpyA(lf.lfFaceName, matching_data[i].lfFaceName); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hfont = SelectObject(hdc, hfont); + charset = GetTextCharset(hdc); + codepage = pGdiGetCodePage(hdc); + trace("acp=%d, lfFaceName=%s, lfCharSet=%d, GetTextCharset=%d, GdiGetCodePage=%d, expected codepage=%d\n", + acp, lf.lfFaceName, lf.lfCharSet, charset, codepage, matching_data[i].expected_codepage); + ok(codepage == matching_data[i].expected_codepage, + "GdiGetCodePage should have returned %d, got %d\n", matching_data[i].expected_codepage, codepage); + + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); + } +} + static void test_GetFontUnicodeRanges(void) { LOGFONTA lf; @@ -4902,6 +4986,7 @@ START_TEST(font) test_GetOutlineTextMetrics(); test_SetTextJustification(); test_font_charset(); + test_GdiGetCodePage(); test_GetFontUnicodeRanges(); test_nonexistent_font(); test_orientation();

1 0

Jörg Höhle : mmsystem: Do not rewrite input parameters.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 1cc26cba6f7ad86d454b252f41ca93bb1005ddcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc26cba6f7ad86d454b252f4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 19 22:54:17 2013 +0100 mmsystem: Do not rewrite input parameters. --- dlls/mmsystem.dll16/message16.c | 12 ------------ dlls/mmsystem.dll16/mmsystem.c | 38 ++++---------------------------------- 2 files changed, 4 insertions(+), 46 deletions(-) diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index 0935ca0..24ae6ef 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -188,8 +188,6 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (UINT wMsg, DWORD_PTR* lpP mh32->dwBytesRecorded = mh16->dwBytesRecorded; mh32->dwUser = mh16->dwUser; mh32->dwFlags = mh16->dwFlags; - /* FIXME: nothing on mh32->lpNext */ - /* could link the mh32->lpNext at this level for memory house keeping */ mh32->dwOffset = (*lpParam2 >= sizeof(MIDIHDR)) ? mh16->dwOffset : 0; mh16->lpNext = mh32; /* for reuse in unprepare and write */ /* store size of passed MIDIHDR?? structure to know if dwOffset is available or not */ @@ -278,9 +276,6 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_UnMap16To32W(UINT wMsg, DWORD_PTR* lp LPMIDIHDR mh16 = MapSL(*(SEGPTR*)((LPSTR)mh32 - sizeof(LPMIDIHDR))); assert(mh16->lpNext == mh32); - mh16->dwBufferLength = mh32->dwBufferLength; - mh16->dwBytesRecorded = mh32->dwBytesRecorded; - mh16->dwUser = mh32->dwUser; mh16->dwFlags = mh32->dwFlags; if (mh16->reserved >= sizeof(MIDIHDR)) mh16->dwOffset = mh32->dwOffset; @@ -501,11 +496,8 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveIn_UnMap16To32W(UINT wMsg, DWORD_PTR* lpP LPWAVEHDR wh16 = MapSL(*(SEGPTR*)((LPSTR)wh32 - sizeof(LPWAVEHDR))); assert(wh16->lpNext == wh32); - wh16->dwBufferLength = wh32->dwBufferLength; wh16->dwBytesRecorded = wh32->dwBytesRecorded; - wh16->dwUser = wh32->dwUser; wh16->dwFlags = wh32->dwFlags; - wh16->dwLoops = wh32->dwLoops; if (wMsg == WIDM_UNPREPARE && fn_ret == MMSYSERR_NOERROR) { HeapFree(GetProcessHeap(), 0, (LPSTR)wh32 - sizeof(LPWAVEHDR)); @@ -734,11 +726,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveOut_UnMap16To32W(UINT wMsg, DWORD_PTR* lp LPWAVEHDR wh16 = MapSL(*(SEGPTR*)((LPSTR)wh32 - sizeof(LPWAVEHDR))); assert(wh16->lpNext == wh32); - wh16->dwBufferLength = wh32->dwBufferLength; - wh16->dwBytesRecorded = wh32->dwBytesRecorded; - wh16->dwUser = wh32->dwUser; wh16->dwFlags = wh32->dwFlags; - wh16->dwLoops = wh32->dwLoops; if (wMsg == WODM_UNPREPARE && fn_ret == MMSYSERR_NOERROR) { HeapFree(GetProcessHeap(), 0, (LPSTR)wh32 - sizeof(LPWAVEHDR)); diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 58b46d9..ac9915f 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -104,20 +104,6 @@ void MMSYSTEM_MMTIME32to16(LPMMTIME16 mmt16, const MMTIME* mmt32) memcpy(&(mmt16->u), &(mmt32->u), sizeof(mmt16->u)); } -/****************************************************************** - * MMSYSTEM_MMTIME16to32 - * - * - */ -static void MMSYSTEM_MMTIME16to32(LPMMTIME mmt32, const MMTIME16* mmt16) -{ - mmt32->wType = mmt16->wType; - /* layout of rest is the same for 32/16, - * Note: mmt16->u is 2 bytes smaller than mmt32->u, which has padding - */ - memcpy(&(mmt32->u), &(mmt16->u), sizeof(mmt16->u)); -} - /************************************************************************** * timeGetSystemTime [MMSYSTEM.601] */ @@ -1153,7 +1139,7 @@ MMRESULT16 WINAPI midiStreamPosition16(HMIDISTRM16 hMidiStrm, LPMMTIME16 lpmmt16 if (!lpmmt16) return MMSYSERR_INVALPARAM; - MMSYSTEM_MMTIME16to32(&mmt32, lpmmt16); + mmt32.wType = lpmmt16->wType; ret = midiStreamPosition(HMIDISTRM_32(hMidiStrm), &mmt32, sizeof(MMTIME)); MMSYSTEM_MMTIME32to16(lpmmt16, &mmt32); return ret; @@ -1288,24 +1274,11 @@ UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16 hWaveOut, /* [in] */ SEGPTR lpsegWaveOutHdr, /* [???] */ UINT16 uSize) /* [in] */ { - LPWAVEHDR lpWaveOutHdr = MapSL(lpsegWaveOutHdr); - UINT16 result; - TRACE("(%04X, %08x, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); - if (lpWaveOutHdr == NULL) return MMSYSERR_INVALPARAM; + if (lpsegWaveOutHdr == 0) return MMSYSERR_INVALPARAM; - if ((result = MMSYSTDRV_Message(HWAVEOUT_32(hWaveOut), WODM_PREPARE, lpsegWaveOutHdr, - uSize)) != MMSYSERR_NOTSUPPORTED) - return result; - - if (lpWaveOutHdr->dwFlags & WHDR_INQUEUE) - return WAVERR_STILLPLAYING; - - lpWaveOutHdr->dwFlags |= WHDR_PREPARED; - lpWaveOutHdr->dwFlags &= ~WHDR_DONE; - - return MMSYSERR_NOERROR; + return MMSYSTDRV_Message(HWAVEOUT_32(hWaveOut), WODM_PREPARE, lpsegWaveOutHdr, uSize); } /************************************************************************** @@ -1581,15 +1554,12 @@ UINT16 WINAPI waveInPrepareHeader16(HWAVEIN16 hWaveIn, /* [in] */ UINT16 uSize) /* [in] */ { LPWAVEHDR lpWaveInHdr = MapSL(lpsegWaveInHdr); - UINT16 ret; TRACE("(%04X, %p, %u);\n", hWaveIn, lpWaveInHdr, uSize); if (lpWaveInHdr == NULL) return MMSYSERR_INVALHANDLE; - lpWaveInHdr->dwBytesRecorded = 0; - ret = MMSYSTDRV_Message(HWAVEIN_32(hWaveIn), WIDM_PREPARE, lpsegWaveInHdr, uSize); - return ret; + return MMSYSTDRV_Message(HWAVEIN_32(hWaveIn), WIDM_PREPARE, lpsegWaveInHdr, uSize); } /**************************************************************************

1 0

Jörg Höhle : mmsystem: Use SEGPTR when the . spec says so.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 5155e8011da8c2057d512b974a2ee55f8859b146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5155e8011da8c2057d512b974… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 19 22:06:04 2013 +0100 mmsystem: Use SEGPTR when the .spec says so. --- dlls/mmsystem.dll16/mmio16.c | 8 ++++---- dlls/mmsystem.dll16/mmsystem.c | 32 ++++++++++++++++---------------- include/wine/mmsystem16.h | 10 +++++----- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/mmsystem.dll16/mmio16.c b/dlls/mmsystem.dll16/mmio16.c index 1db82c2..df28a66 100644 --- a/dlls/mmsystem.dll16/mmio16.c +++ b/dlls/mmsystem.dll16/mmio16.c @@ -424,10 +424,10 @@ MMRESULT16 WINAPI mmioSetInfo16(HMMIO16 hmmio, const MMIOINFO16* lpmmioinfo, UIN /************************************************************************** * mmioSetBuffer [MMSYSTEM.1217] */ -MMRESULT16 WINAPI mmioSetBuffer16(HMMIO16 hmmio, LPSTR pchBuffer, +MMRESULT16 WINAPI mmioSetBuffer16(HMMIO16 hmmio, SEGPTR pchBuffer, LONG cchBuffer, UINT16 uFlags) { - MMRESULT ret = mmioSetBuffer(HMMIO_32(hmmio), MapSL((DWORD)pchBuffer), + MMRESULT ret = mmioSetBuffer(HMMIO_32(hmmio), MapSL(pchBuffer), cchBuffer, uFlags); if (ret == MMSYSERR_NOERROR) @@ -439,10 +439,10 @@ MMRESULT16 WINAPI mmioSetBuffer16(HMMIO16 hmmio, LPSTR pchBuffer, FIXME("really ?\n"); return MMSYSERR_INVALHANDLE; } - MMIO_SetSegmentedBuffer(thunk, (DWORD)pchBuffer, TRUE); + MMIO_SetSegmentedBuffer(thunk, pchBuffer, TRUE); } else - UnMapLS((DWORD)pchBuffer); + UnMapLS(pchBuffer); return ret; } diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 1109ef4..58b46d9 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -814,12 +814,12 @@ UINT16 WINAPI midiOutShortMsg16(HMIDIOUT16 hMidiOut, DWORD dwMsg) * midiOutLongMsg [MMSYSTEM.209] */ UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16 hMidiOut, /* [in] */ - LPMIDIHDR16 lpsegMidiOutHdr, /* [???] NOTE: SEGPTR */ + SEGPTR lpsegMidiOutHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %p, %d)\n", hMidiOut, lpsegMidiOutHdr, uSize); + TRACE("(%04X, %08x, %d)\n", hMidiOut, lpsegMidiOutHdr, uSize); - return MMSYSTDRV_Message(HMIDIOUT_32(hMidiOut), MODM_LONGDATA, (DWORD_PTR)lpsegMidiOutHdr, uSize); + return MMSYSTDRV_Message(HMIDIOUT_32(hMidiOut), MODM_LONGDATA, lpsegMidiOutHdr, uSize); } /************************************************************************** @@ -895,10 +895,10 @@ DWORD WINAPI midiOutMessage16(HMIDIOUT16 hMidiOut, UINT16 uMessage, case MODM_GETVOLUME: return midiOutGetVolume16(hMidiOut, MapSL(dwParam1)); + /* lpMidiOutHdr is still a segmented pointer for these functions */ case MODM_LONGDATA: - return midiOutLongMsg16(hMidiOut, MapSL(dwParam1), dwParam2); + return midiOutLongMsg16(hMidiOut, dwParam1, dwParam2); case MODM_PREPARE: - /* lpMidiOutHdr is still a segmented pointer for this function */ return midiOutPrepareHeader16(hMidiOut, dwParam1, dwParam2); case MODM_UNPREPARE: return midiOutUnprepareHeader16(hMidiOut, dwParam1, dwParam2); @@ -1010,12 +1010,12 @@ UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16 hMidiIn, /* [in] */ * midiInAddBuffer [MMSYSTEM.308] */ UINT16 WINAPI midiInAddBuffer16(HMIDIIN16 hMidiIn, /* [in] */ - MIDIHDR16* lpsegMidiInHdr, /* [???] NOTE: SEGPTR */ + SEGPTR lpsegMidiInHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %p, %d)\n", hMidiIn, lpsegMidiInHdr, uSize); + TRACE("(%04X, %08x, %d)\n", hMidiIn, lpsegMidiInHdr, uSize); - return MMSYSTDRV_Message(HMIDIIN_32(hMidiIn), MIDM_ADDBUFFER, (DWORD_PTR)lpsegMidiInHdr, uSize); + return MMSYSTDRV_Message(HMIDIIN_32(hMidiIn), MIDM_ADDBUFFER, lpsegMidiInHdr, uSize); } /************************************************************************** @@ -1077,7 +1077,7 @@ DWORD WINAPI midiInMessage16(HMIDIIN16 hMidiIn, UINT16 uMessage, case MIDM_UNPREPARE: return midiInUnprepareHeader16(hMidiIn, dwParam1, dwParam2); case MIDM_ADDBUFFER: - return midiInAddBuffer16(hMidiIn, MapSL(dwParam1), dwParam2); + return midiInAddBuffer16(hMidiIn, dwParam1, dwParam2); } return MMSYSTDRV_Message(HMIDIIN_32(hMidiIn), uMessage, dwParam1, dwParam2); } @@ -1330,12 +1330,12 @@ UINT16 WINAPI waveOutUnprepareHeader16(HWAVEOUT16 hWaveOut, /* [in] */ * waveOutWrite [MMSYSTEM.408] */ UINT16 WINAPI waveOutWrite16(HWAVEOUT16 hWaveOut, /* [in] */ - LPWAVEHDR lpsegWaveOutHdr, /* [???] NOTE: SEGPTR */ + SEGPTR lpsegWaveOutHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %p, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); + TRACE("(%04X, %08x, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); - return MMSYSTDRV_Message(HWAVEOUT_32(hWaveOut), WODM_WRITE, (DWORD_PTR)lpsegWaveOutHdr, uSize); + return MMSYSTDRV_Message(HWAVEOUT_32(hWaveOut), WODM_WRITE, lpsegWaveOutHdr, uSize); } /************************************************************************** @@ -1616,14 +1616,14 @@ UINT16 WINAPI waveInUnprepareHeader16(HWAVEIN16 hWaveIn, /* [in] */ * waveInAddBuffer [MMSYSTEM.508] */ UINT16 WINAPI waveInAddBuffer16(HWAVEIN16 hWaveIn, /* [in] */ - WAVEHDR* lpsegWaveInHdr, /* [???] NOTE: SEGPTR */ + SEGPTR lpsegWaveInHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %p, %u);\n", hWaveIn, lpsegWaveInHdr, uSize); + TRACE("(%04X, %08x, %u);\n", hWaveIn, lpsegWaveInHdr, uSize); - if (lpsegWaveInHdr == NULL) return MMSYSERR_INVALPARAM; + if (lpsegWaveInHdr == 0) return MMSYSERR_INVALPARAM; - return MMSYSTDRV_Message(HWAVEIN_32(hWaveIn), WIDM_ADDBUFFER, (DWORD_PTR)lpsegWaveInHdr, uSize); + return MMSYSTDRV_Message(HWAVEIN_32(hWaveIn), WIDM_ADDBUFFER, lpsegWaveInHdr, uSize); } /************************************************************************** diff --git a/include/wine/mmsystem16.h b/include/wine/mmsystem16.h index d30a1ba..05c11be 100644 --- a/include/wine/mmsystem16.h +++ b/include/wine/mmsystem16.h @@ -120,7 +120,7 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16*,UINT16,const WAVEFORMATEX *,DWORD,DWO UINT16 WINAPI waveOutClose16(HWAVEOUT16); UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16,SEGPTR,UINT16); UINT16 WINAPI waveOutUnprepareHeader16(HWAVEOUT16,SEGPTR,UINT16); -UINT16 WINAPI waveOutWrite16(HWAVEOUT16,WAVEHDR*,UINT16); +UINT16 WINAPI waveOutWrite16(HWAVEOUT16,SEGPTR,UINT16); UINT16 WINAPI waveOutPause16(HWAVEOUT16); UINT16 WINAPI waveOutRestart16(HWAVEOUT16); UINT16 WINAPI waveOutReset16(HWAVEOUT16); @@ -139,7 +139,7 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16*,UINT16,const WAVEFORMATEX *,DWORD,DWORD UINT16 WINAPI waveInClose16(HWAVEIN16); UINT16 WINAPI waveInPrepareHeader16(HWAVEIN16,SEGPTR,UINT16); UINT16 WINAPI waveInUnprepareHeader16(HWAVEIN16,SEGPTR,UINT16); -UINT16 WINAPI waveInAddBuffer16(HWAVEIN16,WAVEHDR*,UINT16); +UINT16 WINAPI waveInAddBuffer16(HWAVEIN16,SEGPTR,UINT16); UINT16 WINAPI waveInStart16(HWAVEIN16); UINT16 WINAPI waveInStop16(HWAVEIN16); UINT16 WINAPI waveInReset16(HWAVEIN16); @@ -199,7 +199,7 @@ UINT16 WINAPI midiOutClose16(HMIDIOUT16); UINT16 WINAPI midiOutPrepareHeader16(HMIDIOUT16,SEGPTR,UINT16); UINT16 WINAPI midiOutUnprepareHeader16(HMIDIOUT16,SEGPTR,UINT16); UINT16 WINAPI midiOutShortMsg16(HMIDIOUT16,DWORD); -UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16,MIDIHDR16*,UINT16); +UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16,SEGPTR,UINT16); UINT16 WINAPI midiOutReset16(HMIDIOUT16); UINT16 WINAPI midiOutCachePatches16(HMIDIOUT16,UINT16,WORD*,UINT16); UINT16 WINAPI midiOutCacheDrumPatches16(HMIDIOUT16,UINT16,WORD*,UINT16); @@ -212,7 +212,7 @@ UINT16 WINAPI midiInOpen16(HMIDIIN16*,UINT16,DWORD,DWORD,DWORD); UINT16 WINAPI midiInClose16(HMIDIIN16); UINT16 WINAPI midiInPrepareHeader16(HMIDIIN16,SEGPTR,UINT16); UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16,SEGPTR,UINT16); -UINT16 WINAPI midiInAddBuffer16(HMIDIIN16,MIDIHDR16*,UINT16); +UINT16 WINAPI midiInAddBuffer16(HMIDIIN16,SEGPTR,UINT16); UINT16 WINAPI midiInStart16(HMIDIIN16); UINT16 WINAPI midiInStop16(HMIDIIN16); UINT16 WINAPI midiInReset16(HMIDIIN16); @@ -440,7 +440,7 @@ LONG WINAPI mmioWrite16(HMMIO16,HPCSTR,LONG); LONG WINAPI mmioSeek16(HMMIO16,LONG,INT16); MMRESULT16 WINAPI mmioGetInfo16(HMMIO16,MMIOINFO16*,UINT16); MMRESULT16 WINAPI mmioSetInfo16(HMMIO16,const MMIOINFO16*,UINT16); -UINT16 WINAPI mmioSetBuffer16(HMMIO16,LPSTR,LONG,UINT16); +UINT16 WINAPI mmioSetBuffer16(HMMIO16,SEGPTR,LONG,UINT16); UINT16 WINAPI mmioFlush16(HMMIO16,UINT16); UINT16 WINAPI mmioAdvance16(HMMIO16,MMIOINFO16*,UINT16); LRESULT WINAPI mmioSendMessage16(HMMIO16,UINT16,LPARAM,LPARAM);

1 0

Jacek Caban : vbscipt: Added string constants.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 5f3c38ed61d8e062954953ec3a64fba6b19a445d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3c38ed61d8e062954953ec3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 12:56:05 2013 +0100 vbscipt: Added string constants. --- dlls/vbscript/global.c | 80 ++++++++++--------------------------------- dlls/vbscript/tests/api.vbs | 14 +++++++ dlls/vbscript/vbdisp.c | 12 ++++++ dlls/vbscript/vbscript.h | 7 +++- 4 files changed, 50 insertions(+), 63 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5b4af6f..9ff1f76 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1609,59 +1609,15 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_vbCr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbCrLf(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbNewLine(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFormFeed(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbLf(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbNullChar(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbNullString(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbTab(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbVerticalTab(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} +static const string_constant_t vbCr = {1, {'\r'}}; +static const string_constant_t vbCrLf = {2, {'\r','\n'}}; +static const string_constant_t vbNewLine = {2, {'\r','\n'}}; +static const string_constant_t vbFormFeed = {1, {0xc}}; +static const string_constant_t vbLf = {1, {'\n'}}; +static const string_constant_t vbNullChar = {1}; +static const string_constant_t vbNullString = {0}; +static const string_constant_t vbTab = {1, {'\t'}}; +static const string_constant_t vbVerticalTab = {1, {0xb}}; static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBUSESYSTEM, NULL, BP_GET, VT_I2, 0}, @@ -1736,15 +1692,15 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBRED, NULL, BP_GET, VT_I4, 0x0000ff}, {DISPID_GLOBAL_VBWHITE, NULL, BP_GET, VT_I4, 0xffffff}, {DISPID_GLOBAL_VBYELLOW, NULL, BP_GET, VT_I4, 0x00ffff}, - {DISPID_GLOBAL_VBCR, Global_vbCr, BP_GET}, - {DISPID_GLOBAL_VBCRLF, Global_vbCrLf, BP_GET}, - {DISPID_GLOBAL_VBNEWLINE, Global_vbNewLine, BP_GET}, - {DISPID_GLOBAL_VBFORMFEED, Global_vbFormFeed, BP_GET}, - {DISPID_GLOBAL_VBLF, Global_vbLf, BP_GET}, - {DISPID_GLOBAL_VBNULLCHAR, Global_vbNullChar, BP_GET}, - {DISPID_GLOBAL_VBNULLSTRING, Global_vbNullString, BP_GET}, - {DISPID_GLOBAL_VBTAB, Global_vbTab, BP_GET}, - {DISPID_GLOBAL_VBVERTICALTAB, Global_vbVerticalTab, BP_GET}, + {DISPID_GLOBAL_VBCR, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbCr}, + {DISPID_GLOBAL_VBCRLF, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbCrLf}, + {DISPID_GLOBAL_VBNEWLINE, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbNewLine}, + {DISPID_GLOBAL_VBFORMFEED, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbFormFeed}, + {DISPID_GLOBAL_VBLF, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbLf}, + {DISPID_GLOBAL_VBNULLCHAR, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbNullChar}, + {DISPID_GLOBAL_VBNULLSTRING, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbNullString}, + {DISPID_GLOBAL_VBTAB, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbTab}, + {DISPID_GLOBAL_VBVERTICALTAB, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbVerticalTab}, {DISPID_GLOBAL_CCUR, Global_CCur, 0, 1}, {DISPID_GLOBAL_CINT, Global_CInt, 0, 1}, {DISPID_GLOBAL_CLNG, Global_CLng, 0, 1}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3e53813..0aaeefb 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -48,6 +48,11 @@ Sub TestConstantI4(name, val, exval) Call ok(getVT(val) = "VT_I4*", "getVT(" & name & ") = " & getVT(val)) End Sub +Sub TestConstantBSTR(name, val, exval) + Call ok(val = exval, name & " = " & val & " expected " & exval) + Call ok(getVT(val) = "VT_BSTR*", "getVT(" & name & ") = " & getVT(val)) +End Sub + TestConstant "vbEmpty", vbEmpty, 0 TestConstant "vbNull", vbNull, 1 TestConstant "vbLong", vbLong, 3 @@ -103,6 +108,15 @@ TestConstantI4 "vbMagenta", vbMagenta, &hff00ff& TestConstantI4 "vbRed", vbRed, &h0000ff& TestConstantI4 "vbWhite", vbWhite, &hffffff& TestConstantI4 "vbYellow", vbYellow, &h00ffff& +TestConstantBSTR "vbCr", vbCr, Chr(13) +TestConstantBSTR "vbCrLf", vbCrLf, Chr(13)&Chr(10) +TestConstantBSTR "vbNewLine", vbNewLine, Chr(13)&Chr(10) +TestConstantBSTR "vbFormFeed", vbFormFeed, Chr(12) +TestConstantBSTR "vbLf", vbLf, Chr(10) +TestConstantBSTR "vbNullChar", vbNullChar, Chr(0) +TestConstantBSTR "vbNullString", vbNullString, "" +TestConstantBSTR "vbTab", vbTab, chr(9) +TestConstantBSTR "vbVerticalTab", vbVerticalTab, chr(11) Sub TestCStr(arg, exval) dim x diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 0c39956..f06a5b6 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -160,6 +160,18 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f V_VT(res) = VT_I4; V_I4(res) = val; break; + case VT_BSTR: { + const string_constant_t *str = (const string_constant_t*)prop->max_args; + BSTR ret; + + ret = SysAllocStringLen(str->buf, str->len); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(res) = VT_BSTR; + V_BSTR(res) = ret; + break; + } default: assert(0); } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index db31b47..e25b524 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -86,7 +86,7 @@ typedef struct { HRESULT (*proc)(vbdisp_t*,VARIANT*,unsigned,VARIANT*); DWORD flags; unsigned min_args; - unsigned max_args; + UINT_PTR max_args; } builtin_prop_t; typedef struct _class_desc_t { @@ -334,6 +334,11 @@ HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,vbscode_t**) DECL HRESULT exec_script(script_ctx_t*,function_t*,IDispatch*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; +typedef struct { + UINT16 len; + WCHAR buf[7]; +} string_constant_t; + #define TID_LIST \ XDIID(ErrObj) \ XDIID(GlobalObj)

1 0

Jacek Caban : vbscript: Make constant type explicit.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 6a6c323306681ef2a422f9711bde6271be9c0d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6c323306681ef2a422f9711… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 12:55:19 2013 +0100 vbscript: Make constant type explicit. --- dlls/vbscript/global.c | 136 ++++++++++++++++++++++++------------------------ dlls/vbscript/vbdisp.c | 11 +++- 2 files changed, 76 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a6c323306681ef2a422f…

1 0

Alessandro Pignotti : quartz: Check byte patterns in GetFileSourceFilter.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: e583f8806eea8928d845dff1953f706d2c3ea207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e583f8806eea8928d845dff19… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Thu Feb 21 16:57:50 2013 +0100 quartz: Check byte patterns in GetFileSourceFilter. The idea is to create a temporary AsyncReader and use it to match a better filter. If no match is found the temporary filter is returned. --- dlls/quartz/filesource.c | 15 ++++- dlls/quartz/filtergraph.c | 133 +++++++++++++++++++++++++++------------------ 2 files changed, 92 insertions(+), 56 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 5bde1e5..95e146d 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -295,7 +295,8 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * if (process_extensions(hkeyMajor, pszFileName, majorType, minorType, sourceFilter) == S_OK) bFound = TRUE; } - else + /* We need a reader interface to check bytes */ + else if (pReader) { DWORD indexMinor; @@ -305,7 +306,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * WCHAR wszMinorKeyName[CHARS_IN_GUID]; DWORD dwMinorKeyNameLen = sizeof(wszMinorKeyName) / sizeof(wszMinorKeyName[0]); WCHAR wszSourceFilterKeyName[CHARS_IN_GUID]; - DWORD dwSourceFilterKeyNameLen = sizeof(wszSourceFilterKeyName) / sizeof(wszSourceFilterKeyName[0]); + DWORD dwSourceFilterKeyNameLen = sizeof(wszSourceFilterKeyName); DWORD maxValueLen; DWORD indexValue; @@ -370,7 +371,15 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * hr = E_FAIL; } else if (bFound) - TRACE("Found file's class: major = %s, subtype = %s\n", qzdebugstr_guid(majorType), qzdebugstr_guid(minorType)); + { + TRACE("Found file's class:\n"); + if(majorType) + TRACE("\tmajor = %s\n", qzdebugstr_guid(majorType)); + if(minorType) + TRACE("\tsubtype = %s\n", qzdebugstr_guid(minorType)); + if(sourceFilter) + TRACE("\tsource filter = %s\n", qzdebugstr_guid(sourceFilter)); + } return hr; } diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4140d23..985e568 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1556,61 +1556,97 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, LPCWSTR lpcw return hr; } +static HRESULT CreateFilterInstanceAndLoadFile(GUID* clsid, LPCOLESTR pszFileName, IBaseFilter **filter) +{ + IFileSourceFilter *source = NULL; + HRESULT hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)filter); + TRACE("CLSID: %s\n", debugstr_guid(clsid)); + if (FAILED(hr)) + return hr; + + hr = IBaseFilter_QueryInterface(*filter, &IID_IFileSourceFilter, (LPVOID*)&source); + if (FAILED(hr)) + { + IBaseFilter_Release(*filter); + return hr; + } + + /* Load the file in the file source filter */ + hr = IFileSourceFilter_Load(source, pszFileName, NULL); + IFileSourceFilter_Release(source); + if (FAILED(hr)) { + WARN("Load (%x)\n", hr); + IBaseFilter_Release(*filter); + return hr; + } + + return hr; +} + /* Some filters implement their own asynchronous reader (Theoretically they all should, try to load it first */ static HRESULT GetFileSourceFilter(LPCOLESTR pszFileName, IBaseFilter **filter) { - static const WCHAR wszReg[] = {'M','e','d','i','a',' ','T','y','p','e','\\','E','x','t','e','n','s','i','o','n','s',0}; - HRESULT hr = S_OK; - HKEY extkey; - LONG lRet; + HRESULT hr; + GUID clsid; + IAsyncReader * pReader = NULL; + IFileSourceFilter* pSource = NULL; + IPin * pOutputPin = NULL; + static const WCHAR wszOutputPinName[] = { 'O','u','t','p','u','t',0 }; - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszReg, 0, KEY_READ, &extkey); - hr = HRESULT_FROM_WIN32(lRet); + /* Try to find a match without reading the file first */ + hr = GetClassMediaFile(NULL, pszFileName, NULL, NULL, &clsid); - if (SUCCEEDED(hr)) + if (!hr) + return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter); + + /* Now create a AyncReader instance, to check for signature bytes in the file */ + hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)filter); + if (FAILED(hr)) + return hr; + + hr = IBaseFilter_QueryInterface(*filter, &IID_IFileSourceFilter, (LPVOID *)&pSource); + if (FAILED(hr)) { - static const WCHAR filtersource[] = {'S','o','u','r','c','e',' ','F','i','l','t','e','r',0}; - WCHAR *ext = PathFindExtensionW(pszFileName); - WCHAR clsid_key[39]; - GUID clsid; - DWORD size = sizeof(clsid_key); - HKEY pathkey; + IBaseFilter_Release(*filter); + return hr; + } - if (!ext) - { - CloseHandle(extkey); - return E_FAIL; - } + hr = IFileSourceFilter_Load(pSource, pszFileName, NULL); + IFileSourceFilter_Release(pSource); + if (FAILED(hr)) + { + IBaseFilter_Release(*filter); + return hr; + } - lRet = RegOpenKeyExW(extkey, ext, 0, KEY_READ, &pathkey); - hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(extkey); - if (FAILED(hr)) - return hr; + hr = IBaseFilter_FindPin(*filter, wszOutputPinName, &pOutputPin); + if (FAILED(hr)) + { + IBaseFilter_Release(*filter); + return hr; + } - lRet = RegQueryValueExW(pathkey, filtersource, NULL, NULL, (LPBYTE)clsid_key, &size); - hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(pathkey); - if (FAILED(hr)) - return hr; + hr = IPin_QueryInterface(pOutputPin, &IID_IAsyncReader, (LPVOID *)&pReader); + IPin_Release(pOutputPin); + if (FAILED(hr)) + { + IBaseFilter_Release(*filter); + return hr; + } - CLSIDFromString(clsid_key, &clsid); + /* Try again find a match */ + hr = GetClassMediaFile(pReader, pszFileName, NULL, NULL, &clsid); + IAsyncReader_Release(pReader); - TRACE("CLSID: %s\n", debugstr_guid(&clsid)); - hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)filter); - if (SUCCEEDED(hr)) - { - IFileSourceFilter *source = NULL; - hr = IBaseFilter_QueryInterface(*filter, &IID_IFileSourceFilter, (LPVOID*)&source); - if (SUCCEEDED(hr)) - IFileSourceFilter_Release(source); - else - IBaseFilter_Release(*filter); - } + if (!hr) + { + /* Release the AsyncReader filter and create the matching one */ + IBaseFilter_Release(*filter); + return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter); } - if (FAILED(hr)) - *filter = NULL; - return hr; + + /* Return the AsyncReader filter */ + return S_OK; } static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR lpcwstrFileName, @@ -1627,9 +1663,6 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR /* Try from file name first, then fall back to default asynchronous reader */ hr = GetFileSourceFilter(lpcwstrFileName, &preader); - - if (FAILED(hr)) - hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&preader); if (FAILED(hr)) { WARN("Unable to create file source filter (%x)\n", hr); return hr; @@ -1648,13 +1681,7 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR goto error; } - /* Load the file in the file source filter */ - hr = IFileSourceFilter_Load(pfile, lpcwstrFileName, NULL); - if (FAILED(hr)) { - WARN("Load (%x)\n", hr); - goto error; - } - + /* The file has been already loaded */ IFileSourceFilter_GetCurFile(pfile, &filename, &mt); if (FAILED(hr)) { WARN("GetCurFile (%x)\n", hr);

1 0

Alessandro Pignotti : quartz: Modify GetClassMediaFile to also extract the SourceFilter value.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: fb2551c59bb7d3e0205fd668be1a8c531180ad06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2551c59bb7d3e0205fd668b… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Thu Feb 21 16:28:50 2013 +0100 quartz: Modify GetClassMediaFile to also extract the SourceFilter value. --- dlls/quartz/filesource.c | 73 ++++++++++++++++++++++++++++++++------------- 1 files changed, 52 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index f518ec7..e81110f 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -79,8 +79,10 @@ static const WCHAR mediatype_name[] = { 'M', 'e', 'd', 'i', 'a', ' ', 'T', 'y', 'p', 'e', 0 }; static const WCHAR subtype_name[] = { 'S', 'u', 'b', 't', 'y', 'p', 'e', 0 }; +static const WCHAR source_filter_name[] = { + 'S','o','u','r','c','e',' ','F','i','l','t','e','r',0}; -static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType) +static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter) { WCHAR *extension; LONG l; @@ -100,17 +102,31 @@ static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GU if (l) return E_FAIL; - size = sizeof(keying); - l = RegQueryValueExW(hsub, mediatype_name, NULL, NULL, (LPBYTE)keying, &size); - if (!l) - CLSIDFromString(keying, majorType); + if (majorType) + { + size = sizeof(keying); + l = RegQueryValueExW(hsub, mediatype_name, NULL, NULL, (LPBYTE)keying, &size); + if (!l) + CLSIDFromString(keying, majorType); + } - size = sizeof(keying); - if (!l) - l = RegQueryValueExW(hsub, subtype_name, NULL, NULL, (LPBYTE)keying, &size); + if (minorType) + { + size = sizeof(keying); + if (!l) + l = RegQueryValueExW(hsub, subtype_name, NULL, NULL, (LPBYTE)keying, &size); + if (!l) + CLSIDFromString(keying, minorType); + } - if (!l) - CLSIDFromString(keying, minorType); + if (sourceFilter) + { + size = sizeof(keying); + if (!l) + l = RegQueryValueExW(hsub, source_filter_name, NULL, NULL, (LPBYTE)keying, &size); + if (!l) + CLSIDFromString(keying, sourceFilter); + } RegCloseKey(hsub); @@ -238,7 +254,7 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p return hr; } -static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType) +static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter) { HKEY hkeyMediaType = NULL; LONG lRet; @@ -248,8 +264,12 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, TRACE("(%p, %s, %p, %p)\n", pReader, debugstr_w(pszFileName), majorType, minorType); - *majorType = GUID_NULL; - *minorType = GUID_NULL; + if(majorType) + *majorType = GUID_NULL; + if(minorType) + *minorType = GUID_NULL; + if(sourceFilter) + *sourceFilter = GUID_NULL; lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszMediaType, 0, KEY_READ, &hkeyMediaType); hr = HRESULT_FROM_WIN32(lRet); @@ -272,7 +292,7 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, TRACE("%s\n", debugstr_w(wszMajorKeyName)); if (!strcmpW(wszExtensions, wszMajorKeyName)) { - if (process_extensions(hkeyMajor, pszFileName, majorType, minorType) == S_OK) + if (process_extensions(hkeyMajor, pszFileName, majorType, minorType, sourceFilter) == S_OK) bFound = TRUE; } else @@ -284,6 +304,8 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, HKEY hkeyMinor; WCHAR wszMinorKeyName[CHARS_IN_GUID]; DWORD dwMinorKeyNameLen = sizeof(wszMinorKeyName) / sizeof(wszMinorKeyName[0]); + WCHAR wszSourceFilterKeyName[CHARS_IN_GUID]; + DWORD dwSourceFilterKeyNameLen = sizeof(wszSourceFilterKeyName) / sizeof(wszSourceFilterKeyName[0]); DWORD maxValueLen; DWORD indexValue; @@ -305,7 +327,6 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, LPWSTR wszPatternString = HeapAlloc(GetProcessHeap(), 0, maxValueLen); DWORD dwValueNameLen = sizeof(wszValueName) / sizeof(wszValueName[0]); /* remember this is in chars */ DWORD dwDataLen = maxValueLen; /* remember this is in bytes */ - static const WCHAR wszSourceFilter[] = {'S','o','u','r','c','e',' ','F','i','l','t','e','r',0}; if (RegEnumValueW(hkeyMinor, indexValue, wszValueName, &dwValueNameLen, NULL, &dwType, (LPBYTE)wszPatternString, &dwDataLen) != ERROR_SUCCESS) { @@ -313,15 +334,25 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, break; } + if (strcmpW(wszValueName, source_filter_name)==0) + continue; + /* if it is not the source filter value */ - if (strcmpW(wszValueName, wszSourceFilter)) + if (process_pattern_string(wszPatternString, pReader) == S_OK) { - if (process_pattern_string(wszPatternString, pReader) == S_OK) + if (majorType && FAILED(CLSIDFromString(wszMajorKeyName, majorType))) + break; + if (minorType && FAILED(CLSIDFromString(wszMinorKeyName, minorType))) + break; + if (sourceFilter) { - if (SUCCEEDED(CLSIDFromString(wszMajorKeyName, majorType)) && - SUCCEEDED(CLSIDFromString(wszMinorKeyName, minorType))) - bFound = TRUE; + /* Look up the source filter key */ + if (RegQueryValueExW(hkeyMinor, source_filter_name, NULL, NULL, (LPBYTE)wszSourceFilterKeyName, &dwSourceFilterKeyNameLen)) + break; + if (FAILED(CLSIDFromString(wszSourceFilterKeyName, sourceFilter))) + break; } + bFound = TRUE; } HeapFree(GetProcessHeap(), 0, wszPatternString); } @@ -605,7 +636,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi This->pmt->pUnk = NULL; This->pmt->lSampleSize = 0; This->pmt->formattype = FORMAT_None; - hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype); + hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL); if (FAILED(hr)) { CoTaskMemFree(This->pmt);

1 0

Nikolay Sivov : msxml3: Update backing docs refcount in put_documentElement ().
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: e5affa70400b67eb2abb66666e5f5eccba17ef5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5affa70400b67eb2abb66666… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 26 10:46:33 2013 +0400 msxml3: Update backing docs refcount in put_documentElement(). --- dlls/msxml3/domdoc.c | 9 +++++++++ dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 2 +- 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index fb96ba0..32e9591 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1538,7 +1538,9 @@ static HRESULT WINAPI domdoc_put_documentElement( domdoc *This = impl_from_IXMLDOMDocument3( iface ); IXMLDOMNode *elementNode; xmlNodePtr oldRoot; + xmlDocPtr old_doc; xmlnode *xmlNode; + int refcount = 0; HRESULT hr; TRACE("(%p)->(%p)\n", This, DOMElement); @@ -1554,7 +1556,14 @@ static HRESULT WINAPI domdoc_put_documentElement( if(xmldoc_remove_orphan(xmlNode->node->doc, xmlNode->node) != S_OK) WARN("%p is not an orphan of %p\n", xmlNode->node->doc, xmlNode->node); + old_doc = xmlNode->node->doc; + if (old_doc != get_doc(This)) + refcount = xmlnode_get_inst_cnt(xmlNode); + + /* old root is still orphaned by its document, update refcount from new root */ + if (refcount) xmldoc_add_refs(get_doc(This), refcount); oldRoot = xmlDocSetRootElement( get_doc(This), xmlNode->node); + if (refcount) xmldoc_release_refs(old_doc, refcount); IXMLDOMNode_Release( elementNode ); if(oldRoot) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 3109a42..6c24119 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -294,6 +294,7 @@ extern LONG xmldoc_add_ref( xmlDocPtr doc ) DECLSPEC_HIDDEN; extern LONG xmldoc_release( xmlDocPtr doc ) DECLSPEC_HIDDEN; extern LONG xmldoc_add_refs( xmlDocPtr doc, LONG refs ) DECLSPEC_HIDDEN; extern LONG xmldoc_release_refs ( xmlDocPtr doc, LONG refs ) DECLSPEC_HIDDEN; +extern int xmlnode_get_inst_cnt( xmlnode *node ) DECLSPEC_HIDDEN; extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ) DECLSPEC_HIDDEN; extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ) DECLSPEC_HIDDEN; extern void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 20f9ba9..4508609 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -402,7 +402,7 @@ static int node_get_inst_cnt(xmlNodePtr node) return ret; } -static int xmlnode_get_inst_cnt(xmlnode *node) +int xmlnode_get_inst_cnt(xmlnode *node) { return node_get_inst_cnt(node->node); }

1 0