February 2009 - Wine-commits

Paul Vriens : fusion/tests: Fix a test failure on Win64.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 09fc4e80632442eeb41dc0a2816546633d25d1c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09fc4e80632442eeb41dc0a28… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 6 08:31:48 2009 +0100 fusion/tests: Fix a test failure on Win64. --- dlls/fusion/tests/fusion.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/fusion.c b/dlls/fusion/tests/fusion.c index d2ed0f9..be3da41 100644 --- a/dlls/fusion/tests/fusion.c +++ b/dlls/fusion/tests/fusion.c @@ -168,7 +168,11 @@ static void test_GetCachePath(void) if (hr == S_OK) { lstrcpyA(nativeimgA, "NativeImages_"); +#ifdef _WIN64 + lstrcpyA(zapfmtA, "%s\\%s\\%s%s_64"); +#else lstrcpyA(zapfmtA, "%s\\%s\\%s%s_32"); +#endif } else {

1 0

Paul Vriens : fusion/tests: Run tests correctly on Win98.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: cf9f4dfa2a772b75091fe81cccadf3e031d71cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9f4dfa2a772b75091fe81cc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 6 08:11:49 2009 +0100 fusion/tests: Run tests correctly on Win98. --- dlls/fusion/tests/fusion.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/fusion/tests/fusion.c b/dlls/fusion/tests/fusion.c index b285ba0..ecdf87c 100644 --- a/dlls/fusion/tests/fusion.c +++ b/dlls/fusion/tests/fusion.c @@ -76,6 +76,8 @@ static BOOL init_functionpointers(void) static void test_GetCachePath(void) { + CHAR windirA[MAX_PATH]; + WCHAR windir[MAX_PATH]; WCHAR cachepath[MAX_PATH]; WCHAR version[MAX_PATH]; WCHAR path[MAX_PATH]; @@ -86,10 +88,6 @@ static void test_GetCachePath(void) static const WCHAR nochange[] = {'n','o','c','h','a','n','g','e',0}; static const WCHAR assembly[] = {'a','s','s','e','m','b','l','y',0}; static const WCHAR gac[] = {'G','A','C',0}; - static const WCHAR nativeimg[] = { - 'N','a','t','i','v','e','I','m','a','g','e','s','_',0}; - static const WCHAR zapfmt[] = { - '%','s','\\','%','s','\\','%','s','%','s','_','3','2',0}; if (!pGetCachePath) { @@ -97,7 +95,9 @@ static void test_GetCachePath(void) return; } - GetWindowsDirectoryW(cachepath, MAX_PATH); + GetWindowsDirectoryA(windirA, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, windirA, -1, windir, MAX_PATH); + lstrcpyW(cachepath, windir); lstrcatW(cachepath, backslash); lstrcatW(cachepath, assembly); lstrcatW(cachepath, backslash); @@ -146,9 +146,17 @@ static void test_GetCachePath(void) if (pGetCORVersion) { + CHAR versionA[MAX_PATH]; + CHAR cachepathA[MAX_PATH]; + + static const CHAR nativeimgA[] = "NativeImages_"; + static const CHAR zapfmtA[] = "%s\\%s\\%s%s_32"; + pGetCORVersion(version, MAX_PATH, &size); - GetWindowsDirectoryW(path, MAX_PATH); - wsprintfW(cachepath, zapfmt, path, assembly, nativeimg, version); + WideCharToMultiByte(CP_ACP, 0, version, -1, versionA, MAX_PATH, 0, 0); + + wsprintfA(cachepathA, zapfmtA, windirA, "assembly", nativeimgA, versionA); + MultiByteToWideChar(CP_ACP, 0, cachepathA, -1, cachepath, MAX_PATH); /* ASM_CACHE_ZAP */ lstrcpyW(path, nochange); @@ -158,7 +166,7 @@ static void test_GetCachePath(void) ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); } - GetWindowsDirectoryW(cachepath, MAX_PATH); + lstrcpyW(cachepath, windir); lstrcatW(cachepath, backslash); lstrcatW(cachepath, assembly);

1 0

Michael Stefaniuc : winejack.drv: The dwParam1/ dwParam2 function arguments are DWORD_PTR.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 2c11f3a5a53fa7101e4ee67ea13e8c74a58b1d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c11f3a5a53fa7101e4ee67ea… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 6 01:12:14 2009 +0100 winejack.drv: The dwParam1/dwParam2 function arguments are DWORD_PTR. --- dlls/winejack.drv/audio.c | 64 +++++++++++++++++++++++--------------------- 1 files changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index 2c44ed4..8bcb5bb 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -1005,10 +1005,11 @@ sym_not_found: /************************************************************************** * wodNotifyClient [internal] */ -static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2) +static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1, + DWORD_PTR dwParam2) { - TRACE("wMsg = 0x%04x dwParm1 = %04X dwParam2 = %04X\n", wMsg, dwParam1, dwParam2); - + TRACE("wMsg = %04X dwParm1 = %08lX dwParam2 = %08lX\n", wMsg, dwParam1, dwParam2); + switch (wMsg) { case WOM_OPEN: case WOM_CLOSE: @@ -1144,7 +1145,7 @@ static DWORD wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) TRACE("notifying client: lpWaveHdr=(%p) lpPlayPtr=(%p) dwFlags=(%d)\n", lpWaveHdr, wwo->lpPlayPtr, lpWaveHdr->dwFlags); - wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); + wodNotifyClient(wwo, WOM_DONE, (DWORD_PTR)lpWaveHdr, 0); } TRACE("Not notifying client: lpWaveHdr=(%p) lpPlayPtr=(%p) lpLoopPtr=(%p)\n", lpWaveHdr, wwo->lpPlayPtr, wwo->lpLoopPtr); @@ -1356,7 +1357,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } EnterCriticalSection(&wwo->access_crst); - retval = wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); + retval = wodNotifyClient(wwo, WOM_OPEN, 0, 0); LeaveCriticalSection(&wwo->access_crst); return retval; @@ -1397,7 +1398,7 @@ static DWORD wodClose(WORD wDevID) #endif DeleteCriticalSection(&wwo->access_crst); /* delete the critical section so we can initialize it again from wodOpen() */ - ret = wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); + ret = wodNotifyClient(wwo, WOM_CLOSE, 0, 0); } return ret; @@ -1657,12 +1658,11 @@ static DWORD wodDevInterface(UINT wDevID, PWCHAR dwParam1, DWORD dwParam2) /************************************************************************** * wodMessage (WINEJACK.7) */ -DWORD WINAPI JACK_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI JACK_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%u, %04X, %08X, %08X, %08X);\n", - wDevID, wMsg, dwUser, dwParam1, dwParam2); - + TRACE("(%u, %04X, %08X, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + switch (wMsg) { case DRVM_INIT: case DRVM_EXIT: @@ -1750,10 +1750,11 @@ static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) /************************************************************************** * widNotifyClient [internal] */ -static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD dwParam1, DWORD dwParam2) +static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, + DWORD_PTR dwParam2) { - TRACE("wMsg = 0x%04x dwParm1 = %04X dwParam2 = %04X\n", wMsg, dwParam1, dwParam2); - + TRACE("wMsg = %04X dwParm1 = %08lX dwParam2 = %08lX\n", wMsg, dwParam1, dwParam2); + switch (wMsg) { case WIM_OPEN: case WIM_CLOSE: @@ -1847,7 +1848,7 @@ static int JACK_callback_wwi (nframes_t nframes, void *arg) TRACE("WaveHdr full. dwBytesRecorded=(%u) dwFlags=(0x%x)\n",lpWaveHdr->dwBytesRecorded,lpWaveHdr->dwFlags); - widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); + widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0); lpWaveHdr = wwi->lpQueuePtr = lpNext; } @@ -2151,7 +2152,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) TRACE("notify client.\n"); EnterCriticalSection(&wwi->access_crst); - retval = widNotifyClient(wwi, WIM_OPEN, 0L, 0L); + retval = widNotifyClient(wwi, WIM_OPEN, 0, 0); LeaveCriticalSection(&wwi->access_crst); return retval; @@ -2190,8 +2191,8 @@ static DWORD widClose(WORD wDevID) JACK_CloseWaveInDevice(wwi); /* close the jack device */ #endif DeleteCriticalSection(&wwi->access_crst); /* delete the critical section so we can initialize it again from wodOpen() */ - - ret = widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); + + ret = widNotifyClient(wwi, WIM_CLOSE, 0, 0); } return ret; @@ -2277,7 +2278,7 @@ static DWORD widStop(WORD wDevID) TRACE("stop %p %p\n", lpWaveHdr, lpWaveHdr->lpNext); lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); + widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0); wwi->lpQueuePtr = lpNext; } } @@ -2307,8 +2308,8 @@ static DWORD widReset(WORD wDevID) TRACE("reset %p %p\n", lpWaveHdr, lpWaveHdr->lpNext); lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - - widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); + + widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0); } wwi->lpQueuePtr = NULL; @@ -2354,11 +2355,10 @@ static DWORD widDevInterface(UINT wDevID, PWCHAR dwParam1, DWORD dwParam2) /************************************************************************** * widMessage (WINEJACK.6) */ -DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%u, %04X, %08X, %08X, %08X);\n", - wDevID, wMsg, dwUser, dwParam1, dwParam2); + TRACE("(%u, %04X, %08X, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { case DRVM_INIT: @@ -2391,20 +2391,22 @@ DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, /************************************************************************** * widMessage (WINEJACK.6) */ -DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - FIXME("(%u, %04X, %08X, %08X, %08X):jack support not compiled into wine\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + FIXME("(%u, %04X, %08X, %08lX, %08lX):jack support not compiled into wine\n", + wDevID, wMsg, dwUser, dwParam1, dwParam2); return MMSYSERR_NOTENABLED; } /************************************************************************** * wodMessage (WINEJACK.7) */ -DWORD WINAPI JACK_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI JACK_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - FIXME("(%u, %04X, %08X, %08X, %08X):jack support not compiled into wine\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); + FIXME("(%u, %04X, %08X, %08lX, %08lX):jack support not compiled into wine\n", + wDevID, wMsg, dwUser, dwParam1, dwParam2); return MMSYSERR_NOTENABLED; }

1 0

Andre Wisplinghoff : comdlg32: Update German and French translation.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 6c96347121be5953f075f6ffd04d720f64f55323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c96347121be5953f075f6ffd… Author: Andre Wisplinghoff <andre.wisplinghoff(a)gmail.com> Date: Fri Feb 6 00:19:57 2009 +0100 comdlg32: Update German and French translation. --- dlls/comdlg32/cdlg_De.rc | 2 +- dlls/comdlg32/cdlg_Fr.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/cdlg_De.rc b/dlls/comdlg32/cdlg_De.rc index 5f86e0c..46c4291 100644 --- a/dlls/comdlg32/cdlg_De.rc +++ b/dlls/comdlg32/cdlg_De.rc @@ -409,7 +409,7 @@ Bitte geben sie einen Wert zwischen %d und %d an." PD32_MARGINS_IN_MILLIMETERS "R�nder [mm]" PD32_MILLIMETERS "mm" - PD32_PRINTER_STATUS_READY "Bereit; " + PD32_PRINTER_STATUS_READY "Bereit" PD32_PRINTER_STATUS_PAUSED "Gestoppt; " PD32_PRINTER_STATUS_ERROR "Fehler; " PD32_PRINTER_STATUS_PENDING_DELETION "Wartet auf L�schung; " diff --git a/dlls/comdlg32/cdlg_Fr.rc b/dlls/comdlg32/cdlg_Fr.rc index b8f90f9..bd93a10 100644 --- a/dlls/comdlg32/cdlg_Fr.rc +++ b/dlls/comdlg32/cdlg_Fr.rc @@ -419,7 +419,7 @@ Veuillez en installer une et r PD32_MARGINS_IN_MILLIMETERS "Marges [mm]" PD32_MILLIMETERS "mm" - PD32_PRINTER_STATUS_READY "Pr�t�; " + PD32_PRINTER_STATUS_READY "Pr�t" PD32_PRINTER_STATUS_PAUSED "Suspendu�; " PD32_PRINTER_STATUS_ERROR "Erreur�; " PD32_PRINTER_STATUS_PENDING_DELETION "En attente de suppression�; "

1 0

Michael Stefaniuc : winmm: SendDriverMessage takes LPARAM as 3rd and 4th argument.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: b8a5ab2924014fe681bd08d4a35c00ec02bdfc80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a5ab2924014fe681bd08d4a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 6 01:11:18 2009 +0100 winmm: SendDriverMessage takes LPARAM as 3rd and 4th argument. --- dlls/winmm/joystick.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 0173926..996a4fa 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -143,7 +143,7 @@ UINT WINAPI joyGetNumDevs(void) for (i = 0; i < MAXJOYSTICK; i++) { if (JOY_LoadDriver(i)) { - ret += SendDriverMessage(JOY_Sticks[i].hDriver, JDD_GETNUMDEVS, 0L, 0L); + ret += SendDriverMessage(JOY_Sticks[i].hDriver, JDD_GETNUMDEVS, 0, 0); } } return ret; @@ -160,7 +160,7 @@ MMRESULT WINAPI joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) lpCaps->wPeriodMin = JOY_PERIOD_MIN; /* FIXME */ lpCaps->wPeriodMax = JOY_PERIOD_MAX; /* FIXME (same as MS Joystick Driver) */ - return SendDriverMessage(JOY_Sticks[wID].hDriver, JDD_GETDEVCAPS, (DWORD)lpCaps, wSize); + return SendDriverMessage(JOY_Sticks[wID].hDriver, JDD_GETDEVCAPS, (LPARAM)lpCaps, wSize); } /************************************************************************** @@ -234,7 +234,7 @@ MMRESULT WINAPI joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo) lpInfo->dwReserved1 = 0; lpInfo->dwReserved2 = 0; - return SendDriverMessage(JOY_Sticks[wID].hDriver, JDD_GETPOSEX, (DWORD)lpInfo, 0L); + return SendDriverMessage(JOY_Sticks[wID].hDriver, JDD_GETPOSEX, (LPARAM)lpInfo, 0); } /************************************************************************** @@ -252,7 +252,7 @@ MMRESULT WINAPI joyGetPos(UINT wID, LPJOYINFO lpInfo) lpInfo->wZpos = 0; lpInfo->wButtons = 0; - return SendDriverMessage(JOY_Sticks[wID].hDriver, JDD_GETPOS, (DWORD)lpInfo, 0L); + return SendDriverMessage(JOY_Sticks[wID].hDriver, JDD_GETPOS, (LPARAM)lpInfo, 0); } /**************************************************************************

1 0

Marcus Meissner : mshtml: Fixed size passed to MultiByteToWideChar.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: ad0a5f1bd25be48a84e587acdce5cad4bbb96c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad0a5f1bd25be48a84e587acd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Feb 5 22:03:59 2009 +0100 mshtml: Fixed size passed to MultiByteToWideChar. --- dlls/mshtml/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index df8c8be..15f6d93 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -447,7 +447,7 @@ static LPWSTR get_url(void) if(size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) { strcatW(url, v_formatW); - MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, url+strlenW(url), (size-strlenW(url))/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, url+strlenW(url), size/sizeof(WCHAR)-strlenW(url)); } TRACE("Got URL %s\n", debugstr_w(url));

1 0

Ken Thomases : winecoreaudio.drv: Add support for waveOutBreakLoop/ WODM_BREAKLOOP.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 4cfa5b875ce4d6844a1a6417b8d0dcf0914cb42a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cfa5b875ce4d6844a1a6417b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 5 15:49:04 2009 -0600 winecoreaudio.drv: Add support for waveOutBreakLoop/WODM_BREAKLOOP. --- dlls/winecoreaudio.drv/audio.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 1d5df02..43f2451 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1329,6 +1329,36 @@ static DWORD wodReset(WORD wDevID) } /************************************************************************** +* wodBreakLoop [internal] +*/ +static DWORD wodBreakLoop(WORD wDevID) +{ + WINE_WAVEOUT* wwo; + + TRACE("(%u);\n", wDevID); + + if (wDevID >= MAX_WAVEOUTDRV) + { + WARN("bad device ID !\n"); + return MMSYSERR_BADDEVICEID; + } + + wwo = &WOutDev[wDevID]; + + OSSpinLockLock(&wwo->lock); + + if (wwo->lpLoopPtr != NULL) + { + /* ensure exit at end of current loop */ + wwo->dwLoops = 1; + } + + OSSpinLockUnlock(&wwo->lock); + + return MMSYSERR_NOERROR; +} + +/************************************************************************** * wodGetPosition [internal] */ static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize) @@ -1488,7 +1518,7 @@ DWORD WINAPI CoreAudio_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, case WODM_WRITE: return wodWrite(wDevID, (LPWAVEHDR) dwParam1, dwParam2); case WODM_PAUSE: return wodPause(wDevID); case WODM_GETPOS: return wodGetPosition(wDevID, (LPMMTIME) dwParam1, dwParam2); - case WODM_BREAKLOOP: return MMSYSERR_NOTSUPPORTED; + case WODM_BREAKLOOP: return wodBreakLoop(wDevID); case WODM_PREPARE: return wodPrepare(wDevID, (LPWAVEHDR)dwParam1, dwParam2); case WODM_UNPREPARE: return wodUnprepare(wDevID, (LPWAVEHDR)dwParam1, dwParam2);

1 0

Marcus Meissner : advapi32: Fixed size of userName.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: fb3d3d020d1082a918df04033846809346b46269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb3d3d020d1082a918df04033… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Feb 5 22:01:34 2009 +0100 advapi32: Fixed size of userName. --- dlls/advapi32/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index d62bb23..38ca284 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2721,7 +2721,7 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI nameLen = UNLEN + 1; - userName = HeapAlloc(GetProcessHeap(), 0, nameLen); + userName = HeapAlloc(GetProcessHeap(), 0, nameLen*sizeof(WCHAR)); if (GetUserNameW(userName, &nameLen) && !strcmpW(lpAccountName, userName)) ret = lookup_user_account_name(Sid, cbSid, ReferencedDomainName,

1 0

Andrew Talbot : msi: Remove unused functions.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: c0ad988e67adc3cac41e37cc6304dea4a4cf8b13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ad988e67adc3cac41e37cc6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 5 20:01:08 2009 +0000 msi: Remove unused functions. --- dlls/msi/events.c | 21 ------------------ dlls/msi/helpers.c | 22 ------------------- dlls/msi/msipriv.h | 7 ------ dlls/msi/registry.c | 11 --------- dlls/msi/string.c | 57 --------------------------------------------------- 5 files changed, 0 insertions(+), 118 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index cb70b69..a89d689 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -278,27 +278,6 @@ VOID ControlEvent_SubscribeToEvent( MSIPACKAGE *package, msi_dialog *dialog, list_add_tail( &package->subscriptions, &sub->entry ); } -VOID ControlEvent_UnSubscribeToEvent( MSIPACKAGE *package, LPCWSTR event, - LPCWSTR control, LPCWSTR attribute ) -{ - struct list *i, *t; - struct subscriber *sub; - - LIST_FOR_EACH_SAFE( i, t, &package->subscriptions ) - { - sub = LIST_ENTRY( i, struct subscriber, entry ); - - if( lstrcmpiW(sub->control,control) ) - continue; - if( lstrcmpiW(sub->attribute,attribute) ) - continue; - if( lstrcmpiW(sub->event,event) ) - continue; - list_remove( &sub->entry ); - free_subscriber( sub ); - } -} - VOID ControlEvent_FireSubscribedEvent( MSIPACKAGE *package, LPCWSTR event, MSIRECORD *rec ) { diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index ea36b3d..5cfb4af 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -871,13 +871,6 @@ void reduce_to_longfilename(WCHAR* filename) memmove(filename, p+1, (strlenW(p+1)+1)*sizeof(WCHAR)); } -void reduce_to_shortfilename(WCHAR* filename) -{ - LPWSTR p = strchrW(filename,'|'); - if (p) - *p = 0; -} - LPWSTR create_component_advertise_string(MSIPACKAGE* package, MSICOMPONENT* component, LPCWSTR feature) { @@ -1071,18 +1064,3 @@ WCHAR* generate_error_string(MSIPACKAGE *package, UINT error, DWORD count, ... ) msiobj_release( &rec->hdr ); return data; } - -void msi_ui_error( DWORD msg_id, DWORD type ) -{ - WCHAR text[2048]; - - static const WCHAR title[] = { - 'W','i','n','d','o','w','s',' ','I','n','s','t','a','l','l','e','r',0 - }; - - if (!MsiLoadStringW( -1, msg_id, text, sizeof(text) / sizeof(text[0]), - MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) )) - return; - - MessageBoxW( NULL, text, title, type ); -} diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 35be0fb..6b15fed 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -655,11 +655,9 @@ enum StringPersistence }; extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ); -extern UINT msi_id2stringW( const string_table *st, UINT string_no, LPWSTR buffer, UINT *sz ); extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); -extern UINT msi_strcmp( const string_table *st, UINT lval, UINT rval, UINT *res ); extern const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ); extern HRESULT msi_init_string_table( IStorage *stg ); extern string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ); @@ -795,7 +793,6 @@ extern LPWSTR msi_reg_get_val_str( HKEY hkey, LPCWSTR name ); extern BOOL msi_reg_get_val_dword( HKEY hkey, LPCWSTR name, DWORD *val); extern DWORD msi_version_str_to_dword(LPCWSTR p); -extern LPWSTR msi_version_dword_to_str(DWORD version); extern LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); extern LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); @@ -973,14 +970,12 @@ extern BOOL create_full_pathW(const WCHAR *path); extern BOOL ACTION_VerifyComponentForAction(const MSICOMPONENT*, INSTALLSTATE); extern BOOL ACTION_VerifyFeatureForAction(const MSIFEATURE*, INSTALLSTATE); extern void reduce_to_longfilename(WCHAR*); -extern void reduce_to_shortfilename(WCHAR*); extern LPWSTR create_component_advertise_string(MSIPACKAGE*, MSICOMPONENT*, LPCWSTR); extern void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature); extern UINT register_unique_action(MSIPACKAGE *, LPCWSTR); extern BOOL check_unique_action(const MSIPACKAGE *, LPCWSTR); extern WCHAR* generate_error_string(MSIPACKAGE *, UINT, DWORD, ... ); extern UINT msi_create_component_directories( MSIPACKAGE *package ); -extern void msi_ui_error( DWORD msg_id, DWORD type ); extern UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid, MSIINSTALLCONTEXT context, DWORD options, LPCWSTR value); @@ -1011,8 +1006,6 @@ extern VOID ControlEvent_CleanupDialogSubscriptions(MSIPACKAGE *package, LPWSTR extern VOID ControlEvent_CleanupSubscriptions(MSIPACKAGE *package); extern VOID ControlEvent_SubscribeToEvent(MSIPACKAGE *package, msi_dialog *dialog, LPCWSTR event, LPCWSTR control, LPCWSTR attribute); -extern VOID ControlEvent_UnSubscribeToEvent( MSIPACKAGE *package, LPCWSTR event, - LPCWSTR control, LPCWSTR attribute ); /* OLE automation */ extern HRESULT create_msiserver(IUnknown *pOuter, LPVOID *ppObj); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 3689724..7f9dcb2 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -392,17 +392,6 @@ DWORD msi_version_str_to_dword(LPCWSTR p) return MAKELONG(build, MAKEWORD(minor, major)); } -LPWSTR msi_version_dword_to_str(DWORD version) -{ - static const WCHAR fmt[] = { '%','u','.','%','u','.','%','u',0 }; - LPWSTR str = msi_alloc(20); - sprintfW(str, fmt, - (version&0xff000000)>>24, - (version&0x00ff0000)>>16, - version&0x0000ffff); - return str; -} - LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) { static const WCHAR emptyW[] = {0}; diff --git a/dlls/msi/string.c b/dlls/msi/string.c index bf7257c..97b1099 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -328,45 +328,6 @@ const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ) } /* - * msi_id2stringW - * - * [in] st - pointer to the string table - * [in] id - id of the string to retrieve - * [out] buffer - destination of the string - * [in/out] sz - number of bytes available in the buffer on input - * number of bytes used on output - * - * The size includes the terminating nul character. Short buffers - * will be filled, but not nul terminated. - */ -UINT msi_id2stringW( const string_table *st, UINT id, LPWSTR buffer, UINT *sz ) -{ - UINT len; - const WCHAR *str; - - TRACE("Finding string %d of %d\n", id, st->maxcount); - - str = msi_string_lookup_id( st, id ); - if( !str ) - return ERROR_FUNCTION_FAILED; - - len = strlenW( str ) + 1; - - if( !buffer ) - { - *sz = len; - return ERROR_SUCCESS; - } - - if( *sz < len ) - *sz = len; - memcpy( buffer, str, (*sz)*sizeof(WCHAR) ); - *sz = len; - - return ERROR_SUCCESS; -} - -/* * msi_id2stringA * * [in] st - pointer to the string table @@ -437,24 +398,6 @@ UINT msi_string2idW( const string_table *st, LPCWSTR str, UINT *id ) return ERROR_INVALID_PARAMETER; } -UINT msi_strcmp( const string_table *st, UINT lval, UINT rval, UINT *res ) -{ - const WCHAR *l_str, *r_str; - - l_str = msi_string_lookup_id( st, lval ); - if( !l_str ) - return ERROR_INVALID_PARAMETER; - - r_str = msi_string_lookup_id( st, rval ); - if( !r_str ) - return ERROR_INVALID_PARAMETER; - - /* does this do the right thing for all UTF-8 strings? */ - *res = strcmpW( l_str, r_str ); - - return ERROR_SUCCESS; -} - static void string_totalsize( const string_table *st, UINT *datasize, UINT *poolsize ) { UINT i, len, holesize;

1 0

Andrew Talbot : netapi32: Remove unused functions.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: e2eaface453edf423b9830f589fa27ba01a95f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2eaface453edf423b9830f58… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 5 20:01:11 2009 +0000 netapi32: Remove unused functions. --- dlls/netapi32/nbnamecache.c | 25 ------------------------- dlls/netapi32/nbnamecache.h | 9 --------- 2 files changed, 0 insertions(+), 34 deletions(-) diff --git a/dlls/netapi32/nbnamecache.c b/dlls/netapi32/nbnamecache.c index b9ed159..5f9b0b5 100644 --- a/dlls/netapi32/nbnamecache.c +++ b/dlls/netapi32/nbnamecache.c @@ -176,31 +176,6 @@ const NBNameCacheEntry *NBNameCacheFindEntry(struct NBNameCache *cache, return ret; } -BOOL NBNameCacheUpdateNBName(struct NBNameCache *cache, - const UCHAR name[NCBNAMSZ], const UCHAR nbname[NCBNAMSZ]) -{ - BOOL ret; - - if (cache) - { - NBNameCacheNode **node; - - EnterCriticalSection(&cache->cs); - node = NBNameCacheWalk(cache, (const char *)name); - if (node && *node && (*node)->entry) - { - memcpy((*node)->entry->nbname, nbname, NCBNAMSZ); - ret = TRUE; - } - else - ret = FALSE; - LeaveCriticalSection(&cache->cs); - } - else - ret = FALSE; - return ret; -} - void NBNameCacheDestroy(struct NBNameCache *cache) { if (cache) diff --git a/dlls/netapi32/nbnamecache.h b/dlls/netapi32/nbnamecache.h index b227ed6..ffefbc5 100644 --- a/dlls/netapi32/nbnamecache.h +++ b/dlls/netapi32/nbnamecache.h @@ -68,15 +68,6 @@ BOOL NBNameCacheAddEntry(struct NBNameCache *cache, NBNameCacheEntry *entry); const NBNameCacheEntry *NBNameCacheFindEntry(struct NBNameCache *cache, const UCHAR name[NCBNAMSZ]); -/* If the entry with name name is in the cache, updates its nbname member to - * nbname. The entry's expire time is implicitly updated to entryExpireTimeMS - * + the current time in MS, since getting the NetBIOS name meant validating - * the name and address anyway. - * Returns TRUE on success or FALSE on failure. - */ -BOOL NBNameCacheUpdateNBName(struct NBNameCache *cache, - const UCHAR name[NCBNAMSZ], const UCHAR nbname[NCBNAMSZ]); - void NBNameCacheDestroy(struct NBNameCache *cache); #endif /* ndef __WINE_NBNAMECACHE_H */

1 0