April 2008 - Wine-Commits - list.winehq.org

Alexander Dorofeyev : wined3d: Remove ENTER_GL/ LEAVE_GL in IWineD3DTextureImpl_PreLoad.
by Alexandre Julliard April 3, 2008

April 3, 2008

Module: wine Branch: master Commit: 9b048221709c31c46f3dbc6ee4b6406c0961a452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b048221709c31c46f3dbc6ee… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:04 2008 +0300 wined3d: Remove ENTER_GL/LEAVE_GL in IWineD3DTextureImpl_PreLoad. --- dlls/wined3d/texture.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 294dd1d..a6919ef 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -115,7 +115,7 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { } IWineD3DTexture_BindTexture(iface); - ENTER_GL(); + /* If the texture is marked dirty or the srgb sampler setting has changed since the last load then reload the surfaces */ if (This->baseTexture.dirty) { for (i = 0; i < This->baseTexture.levels; i++) { @@ -135,7 +135,6 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { } else { TRACE("(%p) Texture not dirty, nothing to do\n" , iface); } - LEAVE_GL(); /* No longer dirty */ This->baseTexture.dirty = FALSE;

1 0

Alexander Dorofeyev : wined3d: Avoid calling LoadTexture with gl lock held in IWineD3DSurfaceImpl_PreLoad .
by Alexandre Julliard April 3, 2008

April 3, 2008

Module: wine Branch: master Commit: b54553a2537d4b44b7e6d36caa6c893b1862b9e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54553a2537d4b44b7e6d36ca… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:00 2008 +0300 wined3d: Avoid calling LoadTexture with gl lock held in IWineD3DSurfaceImpl_PreLoad. Needed to prevent ActivateContext being called while holding gl lock. --- dlls/wined3d/surface.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 28ffdcb..e7f7391 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -509,19 +509,22 @@ void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { } glBindTexture(This->glDescription.target, This->glDescription.textureName); checkGLcall("glBindTexture"); + LEAVE_GL(); IWineD3DSurface_LoadTexture(iface, FALSE); /* This is where we should be reducing the amount of GLMemoryUsed */ } else if (This->glDescription.textureName) { /* NOTE: the level 0 surface of a mpmapped texture must be loaded first! */ /* assume this is a coding error not a real error for now */ FIXME("Mipmap surface has a glTexture bound to it!\n"); + LEAVE_GL(); } if (This->resource.pool == WINED3DPOOL_DEFAULT) { /* Tell opengl to try and keep this texture in video ram (well mostly) */ GLclampf tmp; tmp = 0.9f; + ENTER_GL(); glPrioritizeTextures(1, &This->glDescription.textureName, &tmp); + LEAVE_GL(); } - LEAVE_GL(); } return; }

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DSurfaceImpl_Release.
by Alexandre Julliard April 3, 2008

April 3, 2008

Module: wine Branch: master Commit: 1e6f02ed2b56944c5f74ccc9eb4ba90417ecbdc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6f02ed2b56944c5f74ccc9e… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:11:57 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DSurfaceImpl_Release. --- dlls/wined3d/surface.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d164c2f..28ffdcb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -441,7 +441,9 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { if(This->Flags & SFLAG_PBO) { /* Delete the PBO */ + ENTER_GL(); GL_EXTCALL(glDeleteBuffersARB(1, &This->pbo)); + LEAVE_GL(); } if(This->Flags & SFLAG_DIBSECTION) { @@ -461,10 +463,12 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { if(iface == device->ddraw_primary) device->ddraw_primary = NULL; + ENTER_GL(); LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->renderbuffers, renderbuffer_entry_t, entry) { GL_EXTCALL(glDeleteRenderbuffersEXT(1, &entry->id)); HeapFree(GetProcessHeap(), 0, entry); } + LEAVE_GL(); TRACE("(%p) Released\n", This); HeapFree(GetProcessHeap(), 0, This);

1 0

Alexander Dorofeyev : ddraw: Set surface to NULL on failure in GetAttachedSurface.
by Alexandre Julliard April 3, 2008

April 3, 2008

Module: wine Branch: master Commit: 2caa797e76273852f3aa52491261e24a6d1229a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2caa797e76273852f3aa52491… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:11:43 2008 +0300 ddraw: Set surface to NULL on failure in GetAttachedSurface. --- dlls/ddraw/surface.c | 2 ++ dlls/ddraw/surface_thunks.c | 5 ++--- dlls/ddraw/tests/dsurface.c | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c48e07e..da152de 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -540,6 +540,8 @@ IDirectDrawSurfaceImpl_GetAttachedSurface(IDirectDrawSurface7 *iface, TRACE("(%p) Didn't find a valid surface\n", This); LeaveCriticalSection(&ddraw_cs); + + *Surface = NULL; return DDERR_NOTFOUND; } diff --git a/dlls/ddraw/surface_thunks.c b/dlls/ddraw/surface_thunks.c index ef6d48f..a0786bb 100644 --- a/dlls/ddraw/surface_thunks.c +++ b/dlls/ddraw/surface_thunks.c @@ -228,9 +228,8 @@ IDirectDrawSurface3Impl_GetAttachedSurface(LPDIRECTDRAWSURFACE3 This, hr = IDirectDrawSurface7_GetAttachedSurface(CONVERT(This), &caps, &pAttached7); - if (FAILED(hr)) return hr; - - *ppAttached = CONVERT_REV(pAttached7); + if (FAILED(hr)) *ppAttached = NULL; + else *ppAttached = CONVERT_REV(pAttached7); return hr; } diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 7ff1fe7..1e35e37 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1012,6 +1012,7 @@ static void EnumTest(void) ok(rc == DD_OK, "GetAttachedSurface returned %08x\n", rc); rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[2], &ddsd.ddsCaps, &ctx.expected[3]); ok(rc == DDERR_NOTFOUND, "GetAttachedSurface returned %08x\n", rc); + ok(!ctx.expected[3], "expected NULL pointer\n"); ctx.count = 0; rc = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &ddsd, (void *) &ctx, enumCB); @@ -1077,6 +1078,9 @@ static void AttachmentTest7(void) ok(num == 0, "Second mip level has %d surfaces attached, expected 1\n", num); /* Done level 2 */ /* Mip level 3 is still needed */ + hr = IDirectDrawSurface7_GetAttachedSurface(surface3, &caps, &surface4); + ok(hr == DDERR_NOTFOUND, "GetAttachedSurface returned %08x\n", hr); + ok(!surface4, "expected NULL pointer\n"); /* Try to attach a 16x16 miplevel - Should not work as far I can see */ memset(&ddsd, 0, sizeof(ddsd));

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in surface_bind_and_dirtify.
by Alexandre Julliard April 3, 2008

April 3, 2008

Module: wine Branch: master Commit: d5b400307bd02ff70adaf51caa4d8def7e89db0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b400307bd02ff70adaf51ca… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:11:50 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in surface_bind_and_dirtify. --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 573ac36..e233ce2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -47,7 +47,9 @@ static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This) { * TODO: Track the current active texture per GL context instead of using glGet */ if (GL_SUPPORT(ARB_MULTITEXTURE)) { + ENTER_GL(); glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture); + LEAVE_GL(); active_texture -= GL_TEXTURE0_ARB; } else { active_texture = 0;

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in surface_allocate_surface.
by Alexandre Julliard April 3, 2008

April 3, 2008

Module: wine Branch: master Commit: 088c34ec1c465728b5cb2d07bb1d69958bbc5279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=088c34ec1c465728b5cb2d07b… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:11:54 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in surface_allocate_surface. --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e233ce2..d164c2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -301,8 +301,10 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, /* Neither NONPOW2, DIBSECTION nor OVERSIZE flags can be set on compressed textures */ This->Flags |= SFLAG_CLIENT; mem = (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + ENTER_GL(); GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, internal, width, height, 0 /* border */, This->resource.size, mem)); + LEAVE_GL(); } return;

1 0

Alexander Nicolaysen Sørnes : winecfg: Update Norwegian Bokmål resource.
by Alexandre Julliard April 3, 2008

April 3, 2008

Module: wine Branch: master Commit: 9183b472ebac3fd4642655bd2e8c75713b011dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9183b472ebac3fd4642655bd2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Apr 3 00:43:09 2008 +0200 winecfg: Update Norwegian Bokmål resource. --- programs/winecfg/No.rc | 55 ++++++++++++++++++++++++++++++----------------- 1 files changed, 35 insertions(+), 20 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index e9550d5..384a197 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -2,7 +2,7 @@ * WineCfg resources * Norwegian Bokm�l Language Support * - * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,7 +46,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Programminnstillinger ",IDC_STATIC, 8,4,244,240 - LTEXT "Wine kan etterligne forskjellige Windows-versjoner for hvert program. Denne fanen er koblet med bibliotek- og grafikkfanene, s�nn at du kan endre innstillinger for hele systemet eller enkelte program der ogs�.", + LTEXT "Wine kan etterligne forskjellige Windows-versjoner for hvert program. Denne fanen er koblet med bibliotek- og grafikkfanene, s�nn at du kan endre innstillinger for hele systemet eller enkelte programmer der ogs�.", IDC_STATIC,15,20,227,30 CONTROL "Programmer",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,50,230,150 @@ -62,27 +62,27 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Vinduinnstillinger ",IDC_STATIC,8,5,244,180 - CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,15,230,8 - LTEXT "Hvis vinduer kontrolleres av din standardvindusbehandler, f�r de vanlige rammer, og respekterer det virtuelle skrivebordet ditt og vises i vinduslisten.\n\nHvis de er ukontrollerte er de koblet fra vindusbehandleren. Dette betyr at de ikke integreres like godt med skrivebordet ditt, men emuleringen blir mer presis s�nn at noen programmer virker bedre.", - IDC_STATIC,15,38,228,80 - CONTROL "Tillat vindusbehandleren � kontrollere vinduene",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,112,230,8 - + CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 + + CONTROL "Tillat vindusbehandleren � kontrollere vinduene",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 + LTEXT "Hvis vinduer kontrolleres av din standardvindusbehandler, f�r de vanlige rammer, og respekterer det virtuelle skrivebordet ditt og vises i vinduslisten.\n\nHvis de er ukontrollerte er de koblet fra vindusbehandleren. Dette betyr at de ikke integreres like godt med skrivebordet ditt, men emuleringen blir mer presis s�nn at noen programmer virker bedre.", + IDC_STATIC,19,51,225,80 + + CONTROL "Vis et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,15,128,230,10 LTEXT "Du kan velge � emulere et Windows-skrivebord, der alle vinduene er bundet i en virtuell skjerm, eller du kan f� vinduene til � oppf�re seg som andre programmer p� skrivebordet.", - IDC_STATIC,15,126,228,28 + IDC_STATIC,19,138,225,28 LTEXT "St�rrelse:",IDC_DESKTOP_SIZE,15,168,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,168,8,8,WS_DISABLED - CONTROL "Vis et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,153,230,10 - - EDITTEXT IDC_DESKTOP_WIDTH,64,168,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,168,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,109,168,8,8,WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,190,244,50 + GROUPBOX " Direct3D ",IDC_STATIC,8,190,244,48 - LTEXT "Verteks-skyggelegging: ",IDC_STATIC,15,200,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,198,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Verteks-skyggelegging: ",IDC_STATIC,15,203,80,32 + COMBOBOX IDC_D3D_VSHADER_MODE,100,201,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Tillat piksel-skyggelegger (hvis maskinvaren st�tter det)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,217,230,10 + CONTROL "Tillat piksel-skyggelegger (hvis maskinvaren st�tter det)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,219,230,10 GROUPBOX " Skjermoppl�sning (styrer skriftst�rrelse) ",IDC_STATIC,8,242,244,25 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,250,187,15 EDITTEXT IDC_RES_DPIEDIT,204,250,23,13,ES_NUMBER|WS_TABSTOP @@ -196,7 +196,7 @@ BEGIN EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 PUSHBUTTON "Skrift",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED - GROUPBOX " Skallkatalog ",IDC_STATIC,8,114,244,100 + GROUPBOX " Spesielle mapper ",IDC_STATIC,8,114,244,100 CONTROL "Listevisning",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 CONTROL "Pek til:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 @@ -222,7 +222,7 @@ BEGIN IDS_THEMEFILE "Temafiler" IDS_THEMEFILE_SELECT "Velg en temafil" IDS_AUDIO_MISSING "Ingen lyddriver er oppgitt i registeret.\n\nEn anbefalt driver er valgt for deg;\nbruk den eller velg en annen,\n\nog trykk �Bruk� for at endringene skal tre i kraft." - IDS_SHELL_FOLDER "Skallkatalog" + IDS_SHELL_FOLDER "Mappe" IDS_LINKS_TO "Peker til" END @@ -306,4 +306,19 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "Inaktiv tittellinje" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inaktiv titteltekst" IDC_SYSPARAMS_MSGBOX_TEXT "Meldingsvindutekst" + IDC_SYSPARAMS_APPWORKSPACE "Arbeidsomr�de i program" + IDC_SYSPARAMS_WINDOW_FRAME "Visrusramme" + IDC_SYSPARAMS_ACTIVE_BORDER "Aktiv kant" + IDC_SYSPARAMS_INACTIVE_BORDER "Inaktiv kant" + IDC_SYSPARAMS_BUTTON_SHADOW "Kontrollerskygge" + IDC_SYSPARAMS_GRAY_TEXT "Gr� tekst" + IDC_SYSPARAMS_BUTTON_HILIGHT "Merket kontroller" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "M�rk skygge i kontroller" + IDC_SYSPARAMS_BUTTON_LIGHT "Kontrollerlys" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Bakgrunn for skiftende kontroller" + IDC_SYSPARAMS_HOT_TRACKING "Merket element" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Gradient for aktiv tittellinje" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Gradient for inaktiv tittellinje" + IDC_SYSPARAMS_MENU_HILIGHT "Menymerking" + IDC_SYSPARAMS_MENUBAR "Menylinje" END

1 0

Paul Vriens : rsaenh/tests: Fix a typo.
by Alexandre Julliard April 3, 2008

April 3, 2008

Module: wine Branch: master Commit: 77d912e541eb793b2c05b8f6da21a57e315315aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=77d912e541eb793b2c05b8f6d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 3 08:11:20 2008 +0200 rsaenh/tests: Fix a typo. --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 5a7b474..1a8bb92 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1836,7 +1836,7 @@ static void test_null_provider(void) dataLen = sizeof(szName); result = CryptGetProvParam(prov, PP_UNIQUE_CONTAINER, (LPBYTE)szName, &dataLen, 0); ok(result && dataLen == strlen(szContainer)+1 && strcmp(szContainer,szName) == 0, - "failed getting PP_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", + "failed getting PP_UNIQUE_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", (result)? "TRUE":"FALSE",GetLastError(),dataLen); result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(!result && GetLastError() == NTE_NO_KEY,

1 0

Paul Vriens : rsaenh: Add some new flags to wincrypt.h and use one of them.
by Alexandre Julliard April 3, 2008

April 3, 2008

Module: wine Branch: master Commit: 51ee956b953501903ec13c9a2b052882d56429b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ee956b953501903ec13c9a2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 3 08:46:53 2008 +0200 rsaenh: Add some new flags to wincrypt.h and use one of them. --- dlls/rsaenh/rsaenh.c | 8 ++++---- include/wincrypt.h | 13 +++++-------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index e31bace..14e67d7 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3027,11 +3027,11 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD dwTemp; HKEY hKey; - /* This is for dwParam 41, which does not seem to be documented - * on MSDN. IE6 SP1 asks for it in the 'About' dialog, however. + /* This is for dwParam PP_CRYPT_COUNT_KEY_USE. + * IE6 SP1 asks for it in the 'About' dialog. * Returning this BLOB seems to satisfy IE. The marked 0x00 seem * to be 'don't care's. If you know anything more specific about - * provider parameter 41, please report to wine-devel(a)winehq.org */ + * this provider parameter, please report to wine-devel(a)winehq.org */ static CONST BYTE abWTF[96] = { 0xb0, 0x25, 0x63, 0x86, 0x9c, 0xab, 0xb6, 0x37, 0xe8, 0x82, /**/0x00,/**/ 0x72, 0x06, 0xb2, /**/0x00,/**/ 0x3b, @@ -3175,7 +3175,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, sizeof(PROV_ENUMALGS_EX)); } - case 41: /* Undocumented. Asked for by IE About dialog */ + case PP_CRYPT_COUNT_KEY_USE: /* Asked for by IE About dialog */ return copy_param(pbData, pdwDataLen, abWTF, sizeof(abWTF)); default: diff --git a/include/wincrypt.h b/include/wincrypt.h index bf15b93..5d8b203 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1816,14 +1816,6 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s' /* FLAGS Section */ -/* Provider Parameters */ -#define PP_ENUMALGS 1 -#define PP_ENUMCONTAINERS 2 -#define PP_IMPTYPE 3 -#define PP_NAME 4 -#define PP_VERSION 5 -#define PP_CONTAINER 6 - #define CRYPT_FIRST 1 #define CRYPT_NEXT 2 @@ -1880,6 +1872,11 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s' #define PP_USE_HARDWARE_RNG 38 #define PP_KEYSPEC 39 #define PP_ENUMEX_SIGNING_PROT 40 +#define PP_CRYPT_COUNT_KEY_USE 41 +#define PP_USER_CERTSTORE 42 +#define PP_SMARTCARD_READER 43 +#define PP_SMARTCARD_GUID 45 +#define PP_ROOT_CERTSTORE 46 /* Values returned by CryptGetProvParam of PP_KEYSTORAGE */ #define CRYPT_SEC_DESCR 0x00000001

1 0

Dan Hipschman : widl: Fix a mistake in an ordered list (keywords).
by Alexandre Julliard April 3, 2008

April 3, 2008

Module: wine Branch: master Commit: 976f570f61af5a7bf3aaf3102c7a7f5490f208e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=976f570f61af5a7bf3aaf3102… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Apr 2 17:17:01 2008 -0700 widl: Fix a mistake in an ordered list (keywords). --- tools/widl/parser.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 66110b6..5b24b26 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -187,8 +187,8 @@ static const struct keyword keywords[] = { {"TRUE", tTRUE}, {"__cdecl", tCDECL}, {"__fastcall", tFASTCALL}, - {"__pascal", tPASCAL}, {"__int64", tINT64}, + {"__pascal", tPASCAL}, {"__stdcall", tSTDCALL}, {"_cdecl", tCDECL}, {"_fastcall", tFASTCALL},

1 0