February 2009 - Wine-Commits

Paul Vriens : crypt32/tests: Don't crash on Win9x.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: dd298d56a395c09ce395f2ccc2826987ff4dcf3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd298d56a395c09ce395f2ccc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 20 14:31:21 2009 +0100 crypt32/tests: Don't crash on Win9x. --- dlls/crypt32/tests/msg.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 495f2f0..a8193cd 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -196,7 +196,7 @@ static void test_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &value, &size); ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_DATA, "Expected CMSG_DATA, got %d\n", value); - for (i = CMSG_CONTENT_PARAM; i <= CMSG_CMS_SIGNER_INFO_PARAM; i++) + for (i = CMSG_CONTENT_PARAM; have_nt && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) { size = 0; ret = CryptMsgGetParam(msg, i, 0, NULL, &size); @@ -211,7 +211,7 @@ static void test_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &value, &size); ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_ENVELOPED, "Expected CMSG_ENVELOPED, got %d\n", value); - for (i = CMSG_CONTENT_PARAM; i <= CMSG_CMS_SIGNER_INFO_PARAM; i++) + for (i = CMSG_CONTENT_PARAM; have_nt && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) { size = 0; ret = CryptMsgGetParam(msg, i, 0, NULL, &size); @@ -226,7 +226,7 @@ static void test_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &value, &size); ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_HASHED, "Expected CMSG_HASHED, got %d\n", value); - for (i = CMSG_CONTENT_PARAM; i <= CMSG_CMS_SIGNER_INFO_PARAM; i++) + for (i = CMSG_CONTENT_PARAM; have_nt && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) { size = 0; ret = CryptMsgGetParam(msg, i, 0, NULL, &size); @@ -241,7 +241,7 @@ static void test_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &value, &size); ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); ok(value == CMSG_SIGNED, "Expected CMSG_SIGNED, got %d\n", value); - for (i = CMSG_CONTENT_PARAM; i <= CMSG_CMS_SIGNER_INFO_PARAM; i++) + for (i = CMSG_CONTENT_PARAM; have_nt && (i <= CMSG_CMS_SIGNER_INFO_PARAM); i++) { size = 0; ret = CryptMsgGetParam(msg, i, 0, NULL, &size); @@ -3040,6 +3040,8 @@ START_TEST(msg) { init_function_pointers(); have_nt = detect_nt(); + if (!have_nt) + win_skip("Win9x crashes on some parameter checks\n"); /* Basic parameter checking tests */ test_msg_open_to_encode();

1 0

Jon Parshall : fonts: Add the Symbol font.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: fd37a3207266e3fcaeada94a5a56953ea4666df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd37a3207266e3fcaeada94a5… Author: Jon Parshall <jparshall(a)codeweavers.com> Date: Fri Feb 20 12:10:02 2009 +0000 fonts: Add the Symbol font. --- fonts/Makefile.in | 4 + fonts/symbol.sfd | 5966 +++++++++++++++++++++++++++++++++++++++++++++++++++++ fonts/symbol.ttf | Bin 0 -> 26040 bytes 3 files changed, 5970 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd37a3207266e3fcaeada…

1 0

Alexandre Julliard : fonts: Set the symbol flag when generating symbol.ttf.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 4e0c277daa2c955eb0e92b97e6069bfa607132a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0c277daa2c955eb0e92b97e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 20 15:48:59 2009 +0100 fonts: Set the symbol flag when generating symbol.ttf. --- fonts/genttf.ff | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/fonts/genttf.ff b/fonts/genttf.ff index 52de76d..30d1a93 100644 --- a/fonts/genttf.ff +++ b/fonts/genttf.ff @@ -1,2 +1,6 @@ Open($1) -Generate($2, "ttf", 0); +flags = 0 +if ($1 == "symbol.sfd") + flags = 0x2000 +endif +Generate($2, "ttf", flags)

1 0

Paul Vriens : itss/tests: Fix test failures on some Win95 and NT4 boxes.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 1d52f5f00a8624fdf46241e90852a330ebf5b4b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d52f5f00a8624fdf46241e90… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 20 12:39:30 2009 +0100 itss/tests: Fix test failures on some Win95 and NT4 boxes. --- dlls/itss/tests/protocol.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index f93d131..b52e3d3 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -571,7 +571,9 @@ static void test_its_protocol(void) test_protocol = ITS_PROTOCOL; hres = CoGetClassObject(&CLSID_ITSProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + ok(hres == S_OK || + broken(hres == REGDB_E_CLASSNOTREG), /* Some W95 and NT4 */ + "CoGetClassObject failed: %08x\n", hres); if(FAILED(hres)) return; @@ -629,7 +631,9 @@ static void test_mk_protocol(void) hres = CoGetClassObject(&CLSID_MkProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&cf); - ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + ok(hres == S_OK || + broken(hres == REGDB_E_CLASSNOTREG), /* Some W95 and NT4 */ + "CoGetClassObject failed: %08x\n", hres); if(FAILED(hres)) return;

1 0

Paul Vriens : gdi32/tests: Report a missing function only once.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: ac6077023f04fa4eb8e20f616f671dea34d0c9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6077023f04fa4eb8e20f616… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 20 11:47:48 2009 +0100 gdi32/tests: Report a missing function only once. --- dlls/gdi32/tests/font.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6388adc..92623dc 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1960,10 +1960,7 @@ static void test_negative_width(HDC hdc, const LOGFONTA *lf) MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; if(!pGetGlyphIndicesA) - { - skip("GetGlyphIndicesA is unavailable\n"); return; - } /* negative widths are handled just as positive ones */ lf2.lfWidth = -lf->lfWidth; @@ -2508,6 +2505,10 @@ static void test_GetTextMetrics(void) HDC hdc; INT enumed; + /* Report only once */ + if(!pGetGlyphIndicesA) + skip("GetGlyphIndicesA is unavailable, negative width will not be checked\n"); + hdc = GetDC(0); memset(&lf, 0, sizeof(lf));

1 0

Michael Stefaniuc : winmm: Remove superfluous pointer casts.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 8fde5bf80775ee4bc2152aed4fb79abf44af2323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fde5bf80775ee4bc2152aed4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 20 10:23:08 2009 +0100 winmm: Remove superfluous pointer casts. --- dlls/winmm/driver.c | 6 +++--- dlls/winmm/message16.c | 6 +++--- dlls/winmm/mmsystem.c | 2 +- dlls/winmm/playsound.c | 4 ++-- dlls/winmm/tests/wave.c | 6 +++--- dlls/winmm/time.c | 4 ++-- dlls/winmm/winmm.c | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index 87ba8fb..317da60 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -69,7 +69,7 @@ static void DRIVER_Dump(const char *comment) for (lpDrv = lpDrvItemList; lpDrv != NULL; lpDrv = lpDrv->lpNextItem) { - TRACE("%p, magic %04lx, id %p, next %p\n", lpDrv, lpDrv->dwMagic, (void *)lpDrv->d.d32.dwDriverID, lpDrv->lpNextItem); + TRACE("%p, magic %04lx, id %p, next %p\n", lpDrv, lpDrv->dwMagic, lpDrv->d.d32.dwDriverID, lpDrv->lpNextItem); } LeaveCriticalSection( &mmdriver_lock ); @@ -143,10 +143,10 @@ static inline LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT msg, ret = pFnSendMessage16(lpDrv->d.d16.hDriver16, msg, lParam1, lParam2); } else { TRACE("Before call32 proc=%p drvrID=%08lx hDrv=%p wMsg=%04x p1=%08lx p2=%08lx\n", - lpDrv->d.d32.lpDrvProc, lpDrv->d.d32.dwDriverID, (HDRVR)lpDrv, msg, lParam1, lParam2); + lpDrv->d.d32.lpDrvProc, lpDrv->d.d32.dwDriverID, lpDrv, msg, lParam1, lParam2); ret = lpDrv->d.d32.lpDrvProc(lpDrv->d.d32.dwDriverID, (HDRVR)lpDrv, msg, lParam1, lParam2); TRACE("After call32 proc=%p drvrID=%08lx hDrv=%p wMsg=%04x p1=%08lx p2=%08lx => %08lx\n", - lpDrv->d.d32.lpDrvProc, lpDrv->d.d32.dwDriverID, (HDRVR)lpDrv, msg, lParam1, lParam2, ret); + lpDrv->d.d32.lpDrvProc, lpDrv->d.d32.dwDriverID, lpDrv, msg, lParam1, lParam2, ret); } return ret; } diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c index 5a817aa..2413b77 100644 --- a/dlls/winmm/message16.c +++ b/dlls/winmm/message16.c @@ -2103,7 +2103,7 @@ static WINMM_MapType MCI_UnMapMsg16To32W(WORD uDevType, WORD wMsg, DWORD dwFlag mip32w->lpstrReturn, mip32w->dwRetSize / sizeof(WCHAR), MapSL(mip16->lpstrReturn), mip16->dwRetSize, NULL, NULL); - HeapFree(GetProcessHeap(), 0, (LPVOID)mip32w->lpstrReturn); + HeapFree(GetProcessHeap(), 0, mip32w->lpstrReturn); HeapFree(GetProcessHeap(), 0, (LPVOID)lParam); } return WINMM_MAP_OK; @@ -2116,7 +2116,7 @@ static WINMM_MapType MCI_UnMapMsg16To32W(WORD uDevType, WORD wMsg, DWORD dwFlag msip32w->lpstrReturn, msip32w->dwRetSize, MapSL(msip16->lpstrReturn), msip16->dwRetSize, NULL, NULL); - HeapFree(GetProcessHeap(), 0, (LPVOID)msip32w->lpstrReturn); + HeapFree(GetProcessHeap(), 0, msip32w->lpstrReturn); HeapFree(GetProcessHeap(), 0, (LPVOID)lParam); } return WINMM_MAP_OK; @@ -2194,7 +2194,7 @@ static WINMM_MapType MCI_MsgMapper32WTo16_Create(void** ptr, int size16, DWORD m if (!lp) { return WINMM_MAP_NOMEM; } - p32 = (LPBYTE)(*ptr); + p32 = *ptr; if (keep) { *(void**)lp = *ptr; p16 = (LPBYTE)lp + sizeof(void**); diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 69f14fc..4f320f7 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -1883,7 +1883,7 @@ extern DWORD WINAPI GetProcessFlags(DWORD); */ static WINE_MMTHREAD* WINMM_GetmmThread(HANDLE16 h) { - return (WINE_MMTHREAD*)MapSL( MAKESEGPTR(h, 0) ); + return MapSL(MAKESEGPTR(h, 0)); } DWORD WINAPI WINE_mmThreadEntryPoint(LPVOID); diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 1ca0728..a4d21ce 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -263,7 +263,7 @@ static WINE_PLAYSOUND* PlaySound_Alloc(const void* pszSound, HMODULE hmod, static DWORD WINAPI proc_PlaySound(LPVOID arg) { - WINE_PLAYSOUND* wps = (WINE_PLAYSOUND*)arg; + WINE_PLAYSOUND* wps = arg; BOOL bRet = FALSE; HMMIO hmmio = 0; MMCKINFO ckMainRIFF; @@ -302,7 +302,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) memset(&mminfo, 0, sizeof(mminfo)); mminfo.fccIOProc = FOURCC_MEM; - mminfo.pchBuffer = (LPSTR)data; + mminfo.pchBuffer = data; mminfo.cchBuffer = -1; /* FIXME: when a resource, could grab real size */ TRACE("Memory sound %p\n", data); hmmio = mmioOpenW(NULL, &mminfo, MMIO_READ); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index c6b0282..3a656ac 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -569,7 +569,7 @@ static DWORD WINAPI callback_thread(LPVOID lpParameter) MSG msg; PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); /* make sure the thread has a message queue */ - SetEvent((HANDLE)lpParameter); + SetEvent(lpParameter); while (GetMessage(&msg, 0, 0, 0)) { UINT message = msg.message; @@ -578,9 +578,9 @@ static DWORD WINAPI callback_thread(LPVOID lpParameter) message == WOM_CLOSE || message == WM_USER || message == WM_APP, "GetMessage returned unexpected message: %u\n", message); if (message == WOM_OPEN || message == WOM_DONE || message == WOM_CLOSE) - SetEvent((HANDLE)lpParameter); + SetEvent(lpParameter); else if (message == WM_APP) { - SetEvent((HANDLE)lpParameter); + SetEvent(lpParameter); return 0; } } diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 23d0cdc..8c64ac8 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -164,10 +164,10 @@ static int TIME_MMSysTimeCallback(void) switch(timer->wFlags & (TIME_CALLBACK_EVENT_SET|TIME_CALLBACK_EVENT_PULSE)) { case TIME_CALLBACK_EVENT_SET: - SetEvent((HANDLE)timer->lpFunc); + SetEvent(timer->lpFunc); break; case TIME_CALLBACK_EVENT_PULSE: - PulseEvent((HANDLE)timer->lpFunc); + PulseEvent(timer->lpFunc); break; case TIME_CALLBACK_FUNCTION: { diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 02dd5ed..c5a0c66 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -363,7 +363,7 @@ UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, wmld = MMDRV_Alloc(sizeof(WINE_MIXER), MMDRV_MIXER, &hMix, &fdwOpen, &dwCallback, &dwInstance, bFrom32); wmld->uDeviceID = uDeviceID; - mod.hmx = (HMIXEROBJ)hMix; + mod.hmx = hMix; dwRet = MMDRV_Open(wmld, MXDM_OPEN, (DWORD)&mod, CALLBACK_FUNCTION); @@ -464,7 +464,7 @@ UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA break; case MIXER_GETCONTROLDETAILSF_LISTTEXT: { - MIXERCONTROLDETAILS_LISTTEXTA *pDetailsA = (MIXERCONTROLDETAILS_LISTTEXTA *)lpmcdA->paDetails; + MIXERCONTROLDETAILS_LISTTEXTA *pDetailsA = lpmcdA->paDetails; MIXERCONTROLDETAILS_LISTTEXTW *pDetailsW; int size = max(1, lpmcdA->cChannels) * sizeof(MIXERCONTROLDETAILS_LISTTEXTW); unsigned int i; @@ -926,7 +926,7 @@ static LPWINE_MIDI MIDI_OutAlloc(HMIDIOUT* lphMidiOut, DWORD_PTR* lpdwCallback, *lphMidiOut = hMidiOut; if (lpwm) { - lpwm->mod.hMidi = (HMIDI) hMidiOut; + lpwm->mod.hMidi = hMidiOut; lpwm->mod.dwCallback = *lpdwCallback; lpwm->mod.dwInstance = *lpdwInstance; lpwm->mod.dnDevNode = 0; @@ -1253,7 +1253,7 @@ UINT MIDI_InOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, DWORD_PTR dwCallback, if (lpwm == NULL) return MMSYSERR_NOMEM; - lpwm->mod.hMidi = (HMIDI) hMidiIn; + lpwm->mod.hMidi = hMidiIn; lpwm->mod.dwCallback = dwCallback; lpwm->mod.dwInstance = dwInstance;

1 0

Alexandre Julliard : fonts: Re-generate fonts using the "official" fontforge version.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 8330e11ca743c861c325bc772820a94ac2441c08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8330e11ca743c861c325bc772… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 20 15:17:20 2009 +0100 fonts: Re-generate fonts using the "official" fontforge version. --- fonts/courier.sfd | 865 +++++++++++++++++++++-- fonts/courier.ttf | Bin 14288 -> 14288 bytes fonts/marlett.sfd | 228 +++++-- fonts/marlett.ttf | Bin 6136 -> 6136 bytes fonts/ms_sans_serif.sfd | 1063 ++++++++++++++++++++++++----- fonts/ms_sans_serif.ttf | Bin 28572 -> 28572 bytes fonts/small_fonts.sfd | 1705 ++++++++++++++++++++++++++++++++++------------ fonts/small_fonts.ttf | Bin 15956 -> 15956 bytes fonts/small_fonts_jp.sfd | 816 +++++++++++++++++------ fonts/small_fonts_jp.ttf | Bin 9116 -> 9116 bytes fonts/system.sfd | 1417 +++++++++++++++++++++++++++++++------- fonts/system.ttf | Bin 24776 -> 24776 bytes fonts/tahoma.sfd | 1645 ++++++++++++++++++++++++++++++++++++++------ fonts/tahoma.ttf | Bin 85444 -> 85484 bytes fonts/tahomabd.sfd | 1466 ++++++++++++++++++++++++++++++++++++---- fonts/tahomabd.ttf | Bin 75600 -> 75640 bytes 16 files changed, 7680 insertions(+), 1525 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8330e11ca743c861c325b…

1 0

Ricardo Filipe : setupapi: Add missing header values for SetupPromptForDisk .
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 9e8016c3b6b8538c28114c26e57eafa98639a392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8016c3b6b8538c28114c26e… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Feb 18 04:28:52 2009 +0000 setupapi: Add missing header values for SetupPromptForDisk. --- include/setupapi.h | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/setupapi.h b/include/setupapi.h index b36243a..009af29 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1295,11 +1295,11 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_INF_SIGNER_INFO) #define SPDRP_INSTALL_STATE 0x00000022 #define SPDRP_MAXIMUM_PROPERTY 0x00000023 -#define DPROMPT_SUCCESS 0 -#define DPROMPT_CANCEL 1 -#define DPROMPT_SKIPFILE 2 -#define DPROMPT_BUFFERTOSMALL 3 -#define DPROMPT_OUTOFMEMORY 4 +#define DPROMPT_SUCCESS 0 +#define DPROMPT_CANCEL 1 +#define DPROMPT_SKIPFILE 2 +#define DPROMPT_BUFFERTOOSMALL 3 +#define DPROMPT_OUTOFMEMORY 4 #define SETDIRID_NOT_FULL_PATH 0x00000001 @@ -1312,6 +1312,10 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_INF_SIGNER_INFO) #define IDF_NOFOREGROUND 0x00000400 #define IDF_WARNIFSKIP 0x00000800 +#define IDF_NOREMOVABLEMEDIAPROMPT 0x00001000 +#define IDF_USEDISKNAMEASPROMPT 0x00002000 +#define IDF_OEMDISK 0x80000000 + #define INFINFO_INF_SPEC_IS_HINF 1 #define INFINFO_INF_NAME_IS_ABSOLUTE 2 #define INFINFO_DEFAULT_SEARCH 3

1 0

Paul Vriens : fusion/tests: Don't crash if we have a culture attribute.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: e0157f424b775a4e37f6c03d713dfa6d97066428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0157f424b775a4e37f6c03d7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 20 08:37:31 2009 +0100 fusion/tests: Don't crash if we have a culture attribute. --- dlls/fusion/tests/asmenum.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index f3be262..cbc0c40 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -244,11 +244,24 @@ static BOOL enum_gac_assemblies(struct list *assemblies, int depth, LPSTR path) } else if (depth == 1) { - ptr = strstr(ffd.cFileName, "__"); + char culture[MAX_PATH]; + + ptr = strstr(ffd.cFileName, "_"); *ptr = '\0'; - ptr += 2; - sprintf(buf, "Version=%s, Culture=neutral, PublicKeyToken=%s", - ffd.cFileName, ptr); + ptr++; + + if (*ptr != '_') + { + lstrcpyA(culture, ptr); + *strstr(culture, "_") = '\0'; + } + else + lstrcpyA(culture, "neutral"); + + ptr = strchr(ptr, '_'); + ptr++; + sprintf(buf, "Version=%s, Culture=%s, PublicKeyToken=%s", + ffd.cFileName, culture, ptr); lstrcpyA(disp, parent); lstrcatA(disp, buf);

1 0

Alexandre Julliard : ntdll: Call pthread_sigmask directly instead of through the pthread function table .
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 36334a1b5a19bd771da0eff6bc2271761003963a URL: http://source.winehq.org/git/wine.git/?a=commit;h=36334a1b5a19bd771da0eff6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 20 11:15:06 2009 +0100 ntdll: Call pthread_sigmask directly instead of through the pthread function table. --- dlls/ntdll/loader.c | 5 +---- dlls/ntdll/server.c | 14 +++++++------- dlls/ntdll/thread.c | 12 ++++++------ 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 560a932..c7fd267 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -39,7 +39,6 @@ #include "wine/exception.h" #include "wine/library.h" -#include "wine/pthread.h" #include "wine/unicode.h" #include "wine/debug.h" #include "wine/server.h" @@ -56,8 +55,6 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); #define RT_MANIFEST ((ULONG_PTR)24) #define ISOLATIONAWARE_MANIFEST_RESOURCE_ID ((ULONG_PTR)2) -extern struct wine_pthread_functions pthread_functions; - typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); static int process_detaching = 0; /* set on process detach to avoid deadlocks with thread detach */ @@ -2426,7 +2423,7 @@ static NTSTATUS attach_process_dlls( void *wm ) { NTSTATUS status; - pthread_functions.sigprocmask( SIG_UNBLOCK, &server_block_set, NULL ); + pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); RtlEnterCriticalSection( &loader_section ); if ((status = process_attach( wm, (LPVOID)1 )) != STATUS_SUCCESS) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 2a0b3e0..a56557a 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -163,7 +163,7 @@ void server_exit_thread( int status ) fds[1] = ntdll_get_thread_data()->wait_fd[1]; fds[2] = ntdll_get_thread_data()->reply_fd; fds[3] = ntdll_get_thread_data()->request_fd; - pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, NULL ); + pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); info.stack_size = virtual_free_system_view( &info.stack_base ); info.teb_size = virtual_free_system_view( &info.teb_base ); @@ -181,7 +181,7 @@ void server_exit_thread( int status ) */ void server_abort_thread( int status ) { - pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, NULL ); + pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); close( ntdll_get_thread_data()->wait_fd[0] ); close( ntdll_get_thread_data()->wait_fd[1] ); close( ntdll_get_thread_data()->reply_fd ); @@ -323,10 +323,10 @@ unsigned int wine_server_call( void *req_ptr ) sigset_t old_set; unsigned int ret; - pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, &old_set ); + pthread_sigmask( SIG_BLOCK, &server_block_set, &old_set ); ret = send_request( req ); if (!ret) ret = wait_reply( req ); - pthread_functions.sigprocmask( SIG_SETMASK, &old_set, NULL ); + pthread_sigmask( SIG_SETMASK, &old_set, NULL ); return ret; } @@ -336,7 +336,7 @@ unsigned int wine_server_call( void *req_ptr ) */ void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) { - pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, sigset ); + pthread_sigmask( SIG_BLOCK, &server_block_set, sigset ); RtlEnterCriticalSection( cs ); } @@ -347,7 +347,7 @@ void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sig void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) { RtlLeaveCriticalSection( cs ); - pthread_functions.sigprocmask( SIG_SETMASK, sigset, NULL ); + pthread_sigmask( SIG_SETMASK, sigset, NULL ); } @@ -985,7 +985,7 @@ void server_init_process(void) sigaddset( &server_block_set, SIGUSR1 ); sigaddset( &server_block_set, SIGUSR2 ); sigaddset( &server_block_set, SIGCHLD ); - pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, NULL ); + pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); /* receive the first thread request fd on the main socket */ ntdll_get_thread_data()->request_fd = receive_fd( &version ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 7c66660..255c523 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -88,7 +88,7 @@ static void ldt_lock(void) { sigset_t sigset; - pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, &sigset ); + pthread_sigmask( SIG_BLOCK, &server_block_set, &sigset ); RtlEnterCriticalSection( &ldt_section ); if (ldt_section.RecursionCount == 1) ldt_sigset = sigset; } @@ -99,7 +99,7 @@ static void ldt_unlock(void) { sigset_t sigset = ldt_sigset; RtlLeaveCriticalSection( &ldt_section ); - pthread_functions.sigprocmask( SIG_SETMASK, &sigset, NULL ); + pthread_sigmask( SIG_SETMASK, &sigset, NULL ); } else RtlLeaveCriticalSection( &ldt_section ); } @@ -428,7 +428,7 @@ static void start_thread( struct wine_pthread_thread_info *info ) server_init_thread( func ); pthread_functions.init_thread( info ); virtual_alloc_thread_stack( info->stack_base, info->stack_size ); - pthread_functions.sigprocmask( SIG_UNBLOCK, &server_block_set, NULL ); + pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); RtlAcquirePebLock(); InsertHeadList( &tls_links, &teb->TlsLinks ); @@ -524,7 +524,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * return status; } - pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, &sigset ); + pthread_sigmask( SIG_BLOCK, &server_block_set, &sigset ); addr = NULL; size = sigstack_total_size; @@ -577,7 +577,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * status = STATUS_NO_MEMORY; goto error; } - pthread_functions.sigprocmask( SIG_SETMASK, &sigset, NULL ); + pthread_sigmask( SIG_SETMASK, &sigset, NULL ); if (id) id->UniqueThread = ULongToHandle(tid); if (handle_ptr) *handle_ptr = handle; @@ -593,7 +593,7 @@ error: NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } if (handle) NtClose( handle ); - pthread_functions.sigprocmask( SIG_SETMASK, &sigset, NULL ); + pthread_sigmask( SIG_SETMASK, &sigset, NULL ); close( request_pipe[1] ); return status; }

1 0