wine-commits August 2007

wine-commits@winehq.org

3 participants
1085 discussions

Stefan Dösinger : wined3d: Remove the D3DTTFF_PROJECTED handling from drawStridedSlow.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 4779a27eed77c964f9f0a176616580559f055cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4779a27eed77c964f9f0a1766… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 19 19:51:17 2007 +0200 wined3d: Remove the D3DTTFF_PROJECTED handling from drawStridedSlow. --- dlls/wined3d/drawprim.c | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 4eb6786..3b45db3 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -430,36 +430,6 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData case 1: s = ptrToCoords[0]; } - /* Projected is more 'fun' - Move the last coord to the 'q' - parameter (see comments under WINED3DTSS_TEXTURETRANSFORMFLAGS */ - if ((This->stateBlock->textureState[textureNo][WINED3DTSS_TEXTURETRANSFORMFLAGS] != WINED3DTTFF_DISABLE) && - (This->stateBlock->textureState[textureNo][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED)) { - - if (This->stateBlock->textureState[textureNo][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED) { - switch (coordsToUse) { - case 0: /* Drop Through */ - case 1: - FIXME("WINED3DTTFF_PROJECTED but only zero or one coordinate?\n"); - break; - case 2: - q = t; - t = 0.0; - coordsToUse = 4; - break; - case 3: - q = r; - r = 0.0; - coordsToUse = 4; - break; - case 4: /* Nop here */ - break; - default: - FIXME("Unexpected WINED3DTSS_TEXTURETRANSFORMFLAGS value of %d\n", - This->stateBlock->textureState[textureNo][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED); - } - } - } - switch (coordsToUse) { /* Supply the provided texture coords */ case WINED3DTTFF_COUNT1: VTRACE(("tex:%d, s=%f\n", textureNo, s));

1 0

Stefan Dösinger : wined3d: Fix the half pixel correction.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 322b55e29a83a3ab61a1912d751816aa24662e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=322b55e29a83a3ab61a1912d7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 19 19:43:44 2007 +0200 wined3d: Fix the half pixel correction. --- dlls/wined3d/state.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 900e366..4b38e40 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2631,9 +2631,9 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock } checkGLcall("glOrtho"); - /* Window Coord 0 is the middle of the first pixel, so translate by 3/8 pixels */ - glTranslatef(0.375, 0.375, 0); - checkGLcall("glTranslatef(0.375, 0.375, 0)"); + /* Window Coord 0 is the middle of the first pixel, so translate by 1/2 pixels */ + glTranslatef(0.5, 0.5, 0); + checkGLcall("glTranslatef(0.5, 0.5, 0)"); /* D3D texture coordinates are flipped compared to OpenGL ones, so * render everything upside down when rendering offscreen. */ if (stateblock->wineD3DDevice->render_offscreen) { @@ -2647,9 +2647,14 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock the left to the right end of the viewport (with all matrices set to be identity), the x coords of both ends of the line would be not -1 and 1 respectively but (-1-1/viewport_widh) and (1-1/viewport_width) - instead. */ - glTranslatef(0.9 / stateblock->viewport.Width, -0.9 / stateblock->viewport.Height, 0); - checkGLcall("glTranslatef (0.9 / width, -0.9 / height, 0)"); + instead. + + 1.0 / Width is used because the coord range goes from -1.0 to 1.0, then we + divide by the Width/Height, so we need the half range(1.0) to translate by + half a pixel. + */ + glTranslatef(1.0 / stateblock->viewport.Width, -1.0/ stateblock->viewport.Height, 0); + checkGLcall("glTranslatef (1.0 / width, -1.0 / height, 0)"); /* D3D texture coordinates are flipped compared to OpenGL ones, so * render everything upside down when rendering offscreen. */ @@ -3369,8 +3374,8 @@ static void viewport(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCon checkGLcall("glViewport"); - stateblock->wineD3DDevice->posFixup[2] = 0.9 / stateblock->viewport.Width; - stateblock->wineD3DDevice->posFixup[3] = -0.9 / stateblock->viewport.Height; + stateblock->wineD3DDevice->posFixup[2] = 1.0 / stateblock->viewport.Width; + stateblock->wineD3DDevice->posFixup[3] = -1.0 / stateblock->viewport.Height; if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { transform_projection(STATE_TRANSFORM(WINED3DTS_PROJECTION), stateblock, context); }

1 0

Detlef Riekenberg : ntdll: Make RtlCompactHeap more silent.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: a45badf5c0a1c4d4cddf3c131450d796aa393f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45badf5c0a1c4d4cddf3c131… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Aug 27 17:11:36 2007 +0200 ntdll: Make RtlCompactHeap more silent. --- dlls/ntdll/heap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 1369b0d..fb7df12 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1461,7 +1461,8 @@ error: */ ULONG WINAPI RtlCompactHeap( HANDLE heap, ULONG flags ) { - FIXME( "stub\n" ); + static BOOL reported; + if (!reported++) FIXME( "(%p, 0x%x) stub\n", heap, flags ); return 0; }

1 0

Alexandre Julliard : kernel32: Store a few more locale values in the registry.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 2e55b3d6ab16de0923c8ebad607a0b4d4dfca701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e55b3d6ab16de0923c8ebad6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 28 11:36:45 2007 +0200 kernel32: Store a few more locale values in the registry. --- dlls/kernel32/locale.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 859f30a..1d607f1 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -641,6 +641,7 @@ void LOCALE_InitRegistry(void) static const WCHAR lc_timeW[] = { 'L','C','_','T','I','M','E',0 }; static const WCHAR lc_measurementW[] = { 'L','C','_','M','E','A','S','U','R','E','M','E','N','T',0 }; static const WCHAR lc_telephoneW[] = { 'L','C','_','T','E','L','E','P','H','O','N','E',0 }; + static const WCHAR lc_paperW[] = { 'L','C','_','P','A','P','E','R',0}; static const struct { LPCWSTR name; @@ -659,13 +660,20 @@ void LOCALE_InitRegistry(void) LOCALE_ICURRENCY, LOCALE_INEGCURR, LOCALE_ICURRDIGITS, - LOCALE_ILZERO }; + LOCALE_ILZERO, + LOCALE_SMONDECIMALSEP, + LOCALE_SMONGROUPING, + LOCALE_SMONTHOUSANDSEP }; static const LCTYPE lc_numeric_values[] = { LOCALE_SDECIMAL, LOCALE_STHOUSAND, LOCALE_IDIGITS, LOCALE_IDIGITSUBSTITUTION, - LOCALE_SNATIVEDIGITS }; + LOCALE_SNATIVEDIGITS, + LOCALE_INEGNUMBER, + LOCALE_SNEGATIVESIGN, + LOCALE_SPOSITIVESIGN, + LOCALE_SGROUPING }; static const LCTYPE lc_time_values[] = { LOCALE_S1159, LOCALE_S2359, @@ -676,9 +684,15 @@ void LOCALE_InitRegistry(void) LOCALE_SLONGDATE, LOCALE_SDATE, LOCALE_ITIMEMARKPOSN, - LOCALE_ICALENDARTYPE }; + LOCALE_ICALENDARTYPE, + LOCALE_IFIRSTDAYOFWEEK, + LOCALE_IFIRSTWEEKOFYEAR, + LOCALE_STIMEFORMAT, + LOCALE_SYEARMONTH, + LOCALE_IDATE }; static const LCTYPE lc_measurement_values[] = { LOCALE_IMEASURE }; static const LCTYPE lc_telephone_values[] = { LOCALE_ICOUNTRY }; + static const LCTYPE lc_paper_values[] = { LOCALE_IPAPERSIZE }; UNICODE_STRING nameW; WCHAR bufferW[80]; @@ -701,6 +715,8 @@ void LOCALE_InitRegistry(void) sizeof(lc_measurement_values)/sizeof(lc_measurement_values[0]) ); locale_update_registry( hkey, lc_telephoneW, lcid_LC_TELEPHONE, lc_telephone_values, sizeof(lc_telephone_values)/sizeof(lc_telephone_values[0]) ); + locale_update_registry( hkey, lc_paperW, lcid_LC_PAPER, lc_paper_values, + sizeof(lc_paper_values)/sizeof(lc_paper_values[0]) ); if (locale_update_registry( hkey, lc_ctypeW, lcid_LC_CTYPE, NULL, 0 )) {

1 0

Maarten Lankhorst : winealsa: Make SetFormat work better with new behavior of dsound.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: cdc8d971818624b5ab7a410cbd3cd8c80ebcecf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc8d971818624b5ab7a410cb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Aug 27 14:28:52 2007 +0200 winealsa: Make SetFormat work better with new behavior of dsound. --- dlls/winealsa.drv/dsoutput.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 87907b3..c1cd039 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -73,6 +73,7 @@ struct IDsDriverImpl /* IDsDriverImpl fields */ IDsDriverBufferImpl* primary; UINT wDevID; + DWORD forceformat; }; struct IDsDriverBufferImpl @@ -292,6 +293,9 @@ static HRESULT WINAPI IDsDriverBufferImpl_Lock(PIDSDRIVERBUFFER iface, /* **** */ EnterCriticalSection(&This->pcm_crst); + if (dwFlags & DSBLOCK_ENTIREBUFFER) + dwWriteLen = This->mmap_buflen_bytes; + if (dwWriteLen > This->mmap_buflen_bytes || dwWritePosition >= This->mmap_buflen_bytes) { /* **** */ @@ -368,7 +372,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, return DS_OK; } -static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL forced) +static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx) { snd_pcm_t *pcm = NULL; snd_pcm_hw_params_t *hw_params = This->hw_params; @@ -387,11 +391,7 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo default: FIXME("Unsupported bpp: %d\n", pwfx->wBitsPerSample); return DSERR_GENERIC; } - /* **** */ - EnterCriticalSection(&This->pcm_crst); - err = snd_pcm_open(&pcm, WOutDev[This->drv->wDevID].pcmname, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK); - if (err < 0) { if (errno != EBUSY || !This->pcm) @@ -427,13 +427,18 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo * side effects, which may include: Less granular pointer, changing buffer sizes, etc */ #if SND_LIB_VERSION >= 0x010009 - snd_pcm_hw_params_set_rate_resample(pcm, hw_params, 0 && forced); + snd_pcm_hw_params_set_rate_resample(pcm, hw_params, 0); #endif err = snd_pcm_hw_params_set_rate_near(pcm, hw_params, &rate, NULL); if (err < 0) { rate = pwfx->nSamplesPerSec; WARN("Could not set rate\n"); goto err; } - if (!ALSA_NearMatch(rate, pwfx->nSamplesPerSec)) + if (!ALSA_NearMatch(rate, pwfx->nSamplesPerSec) && (This->drv->forceformat++)) + { + WARN("Could not set exact rate %d, instead %d, bombing out\n", pwfx->nSamplesPerSec, rate); + goto err; + } + else if (!ALSA_NearMatch(rate, pwfx->nSamplesPerSec)) { WARN("Could not set sound rate to %d, but instead to %d\n", pwfx->nSamplesPerSec, rate); pwfx->nSamplesPerSec = rate; @@ -463,12 +468,8 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo snd_pcm_close(This->pcm); } This->pcm = pcm; - snd_pcm_prepare(This->pcm); DSDB_CreateMMAP(This); - - /* **** */ - LeaveCriticalSection(&This->pcm_crst); return S_OK; err: @@ -483,8 +484,6 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo if (This->pcm) snd_pcm_hw_params_current(This->pcm, This->hw_params); - /* **** */ - LeaveCriticalSection(&This->pcm_crst); return DSERR_BADFORMAT; } @@ -495,11 +494,15 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetFormat(PIDSDRIVERBUFFER iface, LPWA TRACE("(%p, %p)\n", iface, pwfx); - hr = SetFormat(This, pwfx, TRUE); + /* **** */ + EnterCriticalSection(&This->pcm_crst); + This->drv->forceformat = FALSE; + hr = SetFormat(This, pwfx); + /* **** */ + LeaveCriticalSection(&This->pcm_crst); - if (hr == S_OK) - /* Buffer size / Location changed, so tell dsound to recreate */ - return DSERR_BUFFERLOST; + if (hr == DS_OK) + return S_FALSE; return hr; } @@ -778,7 +781,7 @@ static HRESULT WINAPI IDsDriverImpl_CreateSoundBuffer(PIDSDRIVER iface, (*ippdsdb)->pcm_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ALSA_DSOUTPUT.pcm_crst"); /* SetFormat has to re-initialize pcm here anyway */ - err = SetFormat(*ippdsdb, pwfx, FALSE); + err = SetFormat(*ippdsdb, pwfx); if (FAILED(err)) { WARN("Error occurred: %08x\n", err);

1 0

Juan Lang : wintrust: Test and implement SoftpubInitialize.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 7850caa714784d0e168efcacc45d359498881e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7850caa714784d0e168efcacc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 24 15:12:31 2007 -0700 wintrust: Test and implement SoftpubInitialize. --- dlls/wintrust/Makefile.in | 1 + dlls/wintrust/softpub.c | 37 +++++++++++ dlls/wintrust/tests/Makefile.in | 5 +- dlls/wintrust/tests/softpub.c | 132 +++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust.spec | 2 +- 5 files changed, 174 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in index 4e84922..85bbd77 100644 --- a/dlls/wintrust/Makefile.in +++ b/dlls/wintrust/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ asn.c \ crypt.c \ register.c \ + softpub.c \ wintrust_main.c RC_SRCS = \ diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c new file mode 100644 index 0000000..c5eb503 --- /dev/null +++ b/dlls/wintrust/softpub.c @@ -0,0 +1,37 @@ +/* + * Copyright 2007 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wintrust.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wintrust); + +HRESULT WINAPI SoftpubInitialize(CRYPT_PROVIDER_DATA *data) +{ + HRESULT ret = S_FALSE; + + TRACE("(%p)\n", data); + + if (data->padwTrustStepErrors && + !data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_WVTINIT]) + ret = S_OK; + TRACE("returning %08x\n", ret); + return ret; +} diff --git a/dlls/wintrust/tests/Makefile.in b/dlls/wintrust/tests/Makefile.in index 59a7716..45b15a0 100644 --- a/dlls/wintrust/tests/Makefile.in +++ b/dlls/wintrust/tests/Makefile.in @@ -3,12 +3,13 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = wintrust.dll -IMPORTS = crypt32 user32 advapi32 kernel32 +IMPORTS = wintrust crypt32 user32 advapi32 kernel32 CTESTS = \ asn.c \ crypt.c \ - register.c + register.c \ + softpub.c @MAKE_TEST_RULES@ diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c new file mode 100644 index 0000000..3186379 --- /dev/null +++ b/dlls/wintrust/tests/softpub.c @@ -0,0 +1,132 @@ +/* + * wintrust softpub functions tests + * + * Copyright 2007 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <assert.h> +#include <stdio.h> +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winerror.h> +#include <wintrust.h> +#include <softpub.h> +#include <mssip.h> +#include <winuser.h> + +#include "wine/test.h" + +/* Just in case we're being built with borked headers, redefine function + * pointers to have the correct calling convention. + */ +typedef void *(WINAPI *SAFE_MEM_ALLOC)(DWORD); +typedef void (WINAPI *SAFE_MEM_FREE)(void *); +typedef BOOL (WINAPI *SAFE_ADD_STORE)(CRYPT_PROVIDER_DATA *, + HCERTSTORE); +typedef BOOL (WINAPI *SAFE_ADD_SGNR)(CRYPT_PROVIDER_DATA *, + BOOL, DWORD, struct _CRYPT_PROVIDER_SGNR *); +typedef BOOL (WINAPI *SAFE_ADD_CERT)(CRYPT_PROVIDER_DATA *, + DWORD, BOOL, DWORD, PCCERT_CONTEXT); +typedef BOOL (WINAPI *SAFE_ADD_PRIVDATA)(CRYPT_PROVIDER_DATA *, + CRYPT_PROVIDER_PRIVDATA *); +typedef HRESULT (WINAPI *SAFE_PROVIDER_INIT_CALL)(CRYPT_PROVIDER_DATA *); +typedef HRESULT (WINAPI *SAFE_PROVIDER_OBJTRUST_CALL)(CRYPT_PROVIDER_DATA *); +typedef HRESULT (WINAPI *SAFE_PROVIDER_SIGTRUST_CALL)(CRYPT_PROVIDER_DATA *); +typedef HRESULT (WINAPI *SAFE_PROVIDER_CERTTRUST_CALL)(CRYPT_PROVIDER_DATA *); +typedef HRESULT (WINAPI *SAFE_PROVIDER_FINALPOLICY_CALL)(CRYPT_PROVIDER_DATA *); +typedef HRESULT (WINAPI *SAFE_PROVIDER_TESTFINALPOLICY_CALL)( + CRYPT_PROVIDER_DATA *); +typedef HRESULT (WINAPI *SAFE_PROVIDER_CLEANUP_CALL)(CRYPT_PROVIDER_DATA *); +typedef BOOL (WINAPI *SAFE_PROVIDER_CERTCHKPOLICY_CALL)( + CRYPT_PROVIDER_DATA *, DWORD, BOOL, DWORD); + +typedef struct _SAFE_PROVIDER_FUNCTIONS +{ + DWORD cbStruct; + SAFE_MEM_ALLOC pfnAlloc; + SAFE_MEM_FREE pfnFree; + SAFE_ADD_STORE pfnAddStore2Chain; + SAFE_ADD_SGNR pfnAddSgnr2Chain; + SAFE_ADD_CERT pfnAddCert2Chain; + SAFE_ADD_PRIVDATA pfnAddPrivData2Chain; + SAFE_PROVIDER_INIT_CALL pfnInitialize; + SAFE_PROVIDER_OBJTRUST_CALL pfnObjectTrust; + SAFE_PROVIDER_SIGTRUST_CALL pfnSignatureTrust; + SAFE_PROVIDER_CERTTRUST_CALL pfnCertificateTrust; + SAFE_PROVIDER_FINALPOLICY_CALL pfnFinalPolicy; + SAFE_PROVIDER_CERTCHKPOLICY_CALL pfnCertCheckPolicy; + SAFE_PROVIDER_TESTFINALPOLICY_CALL pfnTestFinalPolicy; + struct _CRYPT_PROVUI_FUNCS *psUIpfns; + SAFE_PROVIDER_CLEANUP_CALL pfnCleanupPolicy; +} SAFE_PROVIDER_FUNCTIONS; + +static void testInitialize(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) +{ + HRESULT ret; + CRYPT_PROVIDER_DATA data = { 0 }; + WINTRUST_DATA wintrust_data = { 0 }; + + if (!funcs->pfnInitialize) + { + skip("missing pfnInitialize\n"); + return; + } + + /* Crashes + ret = funcs->pfnInitialize(NULL); + */ + memset(&data, 0, sizeof(data)); + ret = funcs->pfnInitialize(&data); + ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + data.padwTrustStepErrors = + funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); + /* Without wintrust data set, crashes when padwTrustStepErrors is set */ + data.pWintrustData = &wintrust_data; + if (data.padwTrustStepErrors) + { + /* Apparently, cdwTrustStepErrors does not need to be set. */ + ret = funcs->pfnInitialize(&data); + ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + data.cdwTrustStepErrors = 1; + ret = funcs->pfnInitialize(&data); + ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + memset(data.padwTrustStepErrors, 0xba, + TRUSTERROR_MAX_STEPS * sizeof(DWORD)); + ret = funcs->pfnInitialize(&data); + ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_WVTINIT] = 0; + ret = funcs->pfnInitialize(&data); + ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + funcs->pfnFree(data.padwTrustStepErrors); + } +} + +START_TEST(softpub) +{ + static GUID generic_verify_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; + SAFE_PROVIDER_FUNCTIONS funcs = { sizeof(SAFE_PROVIDER_FUNCTIONS), 0 }; + BOOL ret; + + ret = WintrustLoadFunctionPointers(&generic_verify_v2, + (CRYPT_PROVIDER_FUNCTIONS *)&funcs); + if (!ret) + skip("WintrustLoadFunctionPointers failed\n"); + else + { + testInitialize(&funcs, &generic_verify_v2); + } +} diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index b822cbe..71f104c 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -64,7 +64,7 @@ @ stdcall SoftpubDllUnregisterServer() @ stub SoftpubDumpStructure @ stub SoftpubFreeDefUsageCallData -@ stub SoftpubInitialize +@ stdcall SoftpubInitialize(ptr) @ stub SoftpubLoadDefUsageCallData @ stub SoftpubLoadMessage @ stub SoftpubLoadSignature

1 0

Juan Lang : wintrust: Add trust step error definitions.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: bb963cc92060115b458bf229bcad65028e05b6eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb963cc92060115b458bf229b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 24 15:08:12 2007 -0700 wintrust: Add trust step error definitions. --- include/wintrust.h | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index 0f47261..0fb9838 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -221,6 +221,35 @@ typedef struct _CRYPT_PROVIDER_PRIVDATA { struct _CRYPT_PROVIDER_DATA; +#define TRUSTERROR_STEP_WVTPARAMS 0 +#define TRUSTERROR_STEP_FILEIO 2 +#define TRUSTERROR_STEP_SIP 3 +#define TRUSTERROR_STEP_SIPSUBJINFO 5 +#define TRUSTERROR_STEP_CATALOGFILE 6 +#define TRUSTERROR_STEP_CERTSTORE 7 +#define TRUSTERROR_STEP_MESSAGE 8 +#define TRUSTERROR_STEP_MSG_SIGNERCOUNT 9 +#define TRUSTERROR_STEP_MSG_INNERCNTTYPE 10 +#define TRUSTERROR_STEP_MSG_INNERCNT 11 +#define TRUSTERROR_STEP_MSG_STORE 12 +#define TRUSTERROR_STEP_MSG_SIGNERINFO 13 +#define TRUSTERROR_STEP_MSG_SIGNERCERT 14 +#define TRUSTERROR_STEP_MSG_CERTCHAIN 15 +#define TRUSTERROR_STEP_MSG_COUNTERSIGINFO 16 +#define TRUSTERROR_STEP_MSG_COUNTERSIGCERT 17 +#define TRUSTERROR_STEP_VERIFY_MSGHASH 18 +#define TRUSTERROR_STEP_VERIFY_MSGINDIRECTDATA 19 +#define TRUSTERROR_STEP_FINAL_WVTINIT 30 +#define TRUSTERROR_STEP_FINAL_INITPROV 31 +#define TRUSTERROR_STEP_FINAL_OBJPROV 32 +#define TRUSTERROR_STEP_FINAL_SIGPROV 33 +#define TRUSTERROR_STEP_FINAL_CERTPROV 34 +#define TRUSTERROR_STEP_FINAL_CERTCHKPROV 35 +#define TRUSTERROR_STEP_FINAL_POLICYPROV 36 +#define TRUSTERROR_STEP_FINAL_UIPROV 37 + +#define TRUSTERROR_MAX_STEPS 38 + typedef void * (WINAPI *PFN_CPD_MEM_ALLOC)(DWORD cbSize); typedef void (WINAPI *PFN_CPD_MEM_FREE)(void *pvMem2Free); typedef BOOL (WINAPI *PFN_CPD_ADD_STORE)(struct _CRYPT_PROVIDER_DATA *pProvData,

1 0

Juan Lang : wintrust: Make crypt provider functions calling convention explicit.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 67a0ff46eb40ba0376425bc47a564c2f237065bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a0ff46eb40ba0376425bc47… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 24 15:06:39 2007 -0700 wintrust: Make crypt provider functions calling convention explicit. --- include/wintrust.h | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index 7b0f388..0f47261 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -221,32 +221,32 @@ typedef struct _CRYPT_PROVIDER_PRIVDATA { struct _CRYPT_PROVIDER_DATA; -typedef void * (*PFN_CPD_MEM_ALLOC)(DWORD cbSize); -typedef void (*PFN_CPD_MEM_FREE)(void *pvMem2Free); -typedef BOOL (*PFN_CPD_ADD_STORE)(struct _CRYPT_PROVIDER_DATA *pProvData, +typedef void * (WINAPI *PFN_CPD_MEM_ALLOC)(DWORD cbSize); +typedef void (WINAPI *PFN_CPD_MEM_FREE)(void *pvMem2Free); +typedef BOOL (WINAPI *PFN_CPD_ADD_STORE)(struct _CRYPT_PROVIDER_DATA *pProvData, HCERTSTORE hStore2Add); -typedef BOOL (*PFN_CPD_ADD_SGNR)(struct _CRYPT_PROVIDER_DATA *pProvData, +typedef BOOL (WINAPI *PFN_CPD_ADD_SGNR)(struct _CRYPT_PROVIDER_DATA *pProvData, BOOL fCounterSigner, DWORD idxSigner, struct _CRYPT_PROVIDER_SGNR *pSgnr2Add); -typedef BOOL (*PFN_CPD_ADD_CERT)(struct _CRYPT_PROVIDER_DATA *pProvData, +typedef BOOL (WINAPI *PFN_CPD_ADD_CERT)(struct _CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add); -typedef BOOL (*PFN_CPD_ADD_PRIVDATA)(struct _CRYPT_PROVIDER_DATA *pProvData, +typedef BOOL (WINAPI *PFN_CPD_ADD_PRIVDATA)(struct _CRYPT_PROVIDER_DATA *pProvData, struct _CRYPT_PROVIDER_PRIVDATA *pPrivData2Add); -typedef HRESULT (*PFN_PROVIDER_INIT_CALL)( +typedef HRESULT (WINAPI *PFN_PROVIDER_INIT_CALL)( struct _CRYPT_PROVIDER_DATA *pProvData); -typedef HRESULT (*PFN_PROVIDER_OBJTRUST_CALL)( +typedef HRESULT (WINAPI *PFN_PROVIDER_OBJTRUST_CALL)( struct _CRYPT_PROVIDER_DATA *pProvData); -typedef HRESULT (*PFN_PROVIDER_SIGTRUST_CALL)( +typedef HRESULT (WINAPI *PFN_PROVIDER_SIGTRUST_CALL)( struct _CRYPT_PROVIDER_DATA *pProvData); -typedef HRESULT (*PFN_PROVIDER_CERTTRUST_CALL)( +typedef HRESULT (WINAPI *PFN_PROVIDER_CERTTRUST_CALL)( struct _CRYPT_PROVIDER_DATA *pProvData); -typedef HRESULT (*PFN_PROVIDER_FINALPOLICY_CALL)( +typedef HRESULT (WINAPI *PFN_PROVIDER_FINALPOLICY_CALL)( struct _CRYPT_PROVIDER_DATA *pProvData); -typedef HRESULT (*PFN_PROVIDER_TESTFINALPOLICY_CALL)( +typedef HRESULT (WINAPI *PFN_PROVIDER_TESTFINALPOLICY_CALL)( struct _CRYPT_PROVIDER_DATA *pProvData); -typedef HRESULT (*PFN_PROVIDER_CLEANUP_CALL)( +typedef HRESULT (WINAPI *PFN_PROVIDER_CLEANUP_CALL)( struct _CRYPT_PROVIDER_DATA *pProvData); -typedef BOOL (*PFN_PROVIDER_CERTCHKPOLICY_CALL)( +typedef BOOL (WINAPI *PFN_PROVIDER_CERTCHKPOLICY_CALL)( struct _CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSignerChain, DWORD idxCounterSigner);

1 0

Aric Stewart : imm32: Update position of default IME window.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 39aa7556002076140e2bc43128d17acfc4803c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39aa7556002076140e2bc4312… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 27 20:31:24 2007 +0900 imm32: Update position of default IME window. --- dlls/imm32/imm.c | 51 ++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 38 insertions(+), 13 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index ac5c6eb..2bb1a47 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1967,6 +1967,8 @@ static void PaintDefaultIMEWnd(HWND hwnd) HDC hdc = BeginPaint(hwnd,&ps); LPCOMPOSITIONSTRING compstr; LPBYTE compdata = NULL; + HMONITOR monitor; + MONITORINFO mon_info; GetClientRect(hwnd,&rect); FillRect(hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); @@ -2000,28 +2002,51 @@ static void PaintDefaultIMEWnd(HWND hwnd) rect.top = cpt.y; rect.right = rect.left + pt.x + 20; rect.bottom = rect.top + pt.y + 20; + monitor = MonitorFromPoint(cpt, MONITOR_DEFAULTTOPRIMARY); } else if (root_context->IMC.cfCompForm.dwStyle == CFS_RECT) { - POINT cpt; - cpt.x = root_context->IMC.cfCompForm.rcArea.left; - cpt.y = root_context->IMC.cfCompForm.rcArea.top; - ClientToScreen(root_context->IMC.hWnd,&cpt); - rect.left = cpt.x; - rect.top = cpt.y; - cpt.x = root_context->IMC.cfCompForm.rcArea.right; - cpt.y = root_context->IMC.cfCompForm.rcArea.bottom; - ClientToScreen(root_context->IMC.hWnd,&cpt); - rect.right = cpt.x; - rect.bottom = cpt.y; + rect = root_context->IMC.cfCompForm.rcArea; + MapWindowPoints( root_context->IMC.hWnd, 0, (POINT *)&rect, 2 ); + monitor = MonitorFromRect(&rect, MONITOR_DEFAULTTOPRIMARY); } else { + /* Windows places the default IME window in the bottom left */ + HWND target = root_context->IMC.hWnd; + if (!target) target = GetFocus(); + + GetWindowRect(target,&rect); + rect.top = rect.bottom; rect.right = rect.left + pt.x + 20; rect.bottom = rect.top + pt.y + 20; + monitor = MonitorFromWindow(target, MONITOR_DEFAULTTOPRIMARY); } - MoveWindow(hwnd, rect.left, rect.top, rect.right - rect.left , - rect.bottom - rect.top, FALSE); + + /* make sure we are on the desktop */ + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(monitor, &mon_info); + + if (rect.bottom > mon_info.rcWork.bottom) + { + int shift = rect.bottom - mon_info.rcWork.bottom; + rect.top -= shift; + rect.bottom -= shift; + } + if (rect.left < 0) + { + rect.right -= rect.left; + rect.left = 0; + } + if (rect.right > mon_info.rcWork.right) + { + int shift = rect.right - mon_info.rcWork.right; + rect.left -= shift; + rect.right -= shift; + } + + SetWindowPos(hwnd, HWND_TOPMOST, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, SWP_NOACTIVATE); + TextOutW(hdc, 10,10, CompString, compstr->dwCompStrLen); if (oldfont)

1 0

Stefan Leichter : inseng: Remove 'recursive registry key delete' function.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: f20432bb628df7b0bcd4a2cb3bd99f2c6640f1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20432bb628df7b0bcd4a2cb3… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Aug 27 18:14:16 2007 +0200 inseng: Remove 'recursive registry key delete' function. --- dlls/inseng/regsvr.c | 79 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 71 deletions(-) diff --git a/dlls/inseng/regsvr.c b/dlls/inseng/regsvr.c index 823a3dc..54eee1e 100644 --- a/dlls/inseng/regsvr.c +++ b/dlls/inseng/regsvr.c @@ -120,9 +120,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -211,7 +208,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -318,16 +316,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -440,70 +441,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2007