July 2006 - Wine-commits - list.winehq.org

Dan Hipschman : wpp: In recursive macro definitions, print the macro name instead of nothing.
by Alexandre Julliard 18 Jul '06

18 Jul '06

Module: wine Branch: refs/heads/master Commit: 804993deeababf0c80af65e8a95ab2ec4e4bce0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=804993deeababf0c80af65e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jul 17 15:26:41 2006 -0700 wpp: In recursive macro definitions, print the macro name instead of nothing. --- libs/wpp/ppl.l | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 317c38e..d62cf1d 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -661,6 +661,7 @@ includelogicentry_t *pp_includelogiclist pp_internal_error(__FILE__, __LINE__, "Invalid define type %d\n", ppp->type); } } + else put_buffer(pptext, ppleng); } /*

1 0

Stefan Dösinger : ddraw/wined3d: Remove texture format enumeration functions.
by Alexandre Julliard 18 Jul '06

18 Jul '06

Module: wine Branch: refs/heads/master Commit: bffe5a692274da8f438c6954e7c202525133bde0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bffe5a692274da8f438c695… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jul 18 00:09:09 2006 +0200 ddraw/wined3d: Remove texture format enumeration functions. --- dlls/ddraw/device.c | 192 ++++++++++++++++++++++---------------- dlls/ddraw/direct3d.c | 73 ++++++++------ dlls/wined3d/device.c | 85 ----------------- include/wine/wined3d_interface.h | 8 -- 4 files changed, 150 insertions(+), 208 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bffe5a692274da8f438…

1 0

Stefan Dösinger : wined3d: Duplicate flips in software if the local copy is up to date.
by Alexandre Julliard 18 Jul '06

18 Jul '06

Module: wine Branch: refs/heads/master Commit: 9740555d837bd5b82a1a0c6cf625ea8c4635a7cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9740555d837bd5b82a1a0c6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 17 23:01:32 2006 +0200 wined3d: Duplicate flips in software if the local copy is up to date. --- dlls/wined3d/swapchain.c | 51 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3585ee3..e4b385d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -332,8 +332,55 @@ #endif IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, D3DCLEAR_STENCIL|D3DCLEAR_ZBUFFER, 0x00, 1.0, 0); } - ((IWineD3DSurfaceImpl *) This->frontBuffer)->Flags |= SFLAG_GLDIRTY; - ((IWineD3DSurfaceImpl *) This->backBuffer[0])->Flags |= SFLAG_GLDIRTY; + if(!(((IWineD3DSurfaceImpl *) This->frontBuffer)->Flags & SFLAG_GLDIRTY) || + !(((IWineD3DSurfaceImpl *) This->backBuffer[0])->Flags & SFLAG_GLDIRTY) ) { + /* Both memory copies of the surfaces are ok, flip them around too instead of dirtifying */ + IWineD3DSurfaceImpl *front = (IWineD3DSurfaceImpl *) This->frontBuffer; + IWineD3DSurfaceImpl *back = (IWineD3DSurfaceImpl *) This->backBuffer[0]; + BOOL frontdirty = front->Flags & SFLAG_GLDIRTY; + BOOL backdirty = back->Flags & SFLAG_GLDIRTY; + + /* Flip the DC */ + { + HDC tmp; + tmp = front->hDC; + front->hDC = back->hDC; + back->hDC = tmp; + } + + /* Flip the DIBsection */ + { + HBITMAP tmp; + tmp = front->dib.DIBsection; + front->dib.DIBsection = back->dib.DIBsection; + back->dib.DIBsection = tmp; + } + + /* Flip the surface data */ + { + void* tmp; + + tmp = front->dib.bitmap_data; + front->dib.bitmap_data = back->dib.bitmap_data; + back->dib.bitmap_data = tmp; + + tmp = front->resource.allocatedMemory; + front->resource.allocatedMemory = back->resource.allocatedMemory; + back->resource.allocatedMemory = tmp; + } + + /* client_memory should not be different, but just in case */ + { + BOOL tmp; + tmp = front->dib.client_memory; + front->dib.client_memory = back->dib.client_memory; + back->dib.client_memory = tmp; + } + if(frontdirty) back->Flags |= SFLAG_GLDIRTY; + else back->Flags &= ~SFLAG_GLDIRTY; + if(backdirty) front->Flags |= SFLAG_GLDIRTY; + else front->Flags &= ~SFLAG_GLDIRTY; + } TRACE("returning\n"); return WINED3D_OK;

1 0

Stefan Dösinger : wined3d: Disable the fog before writing the back buffer data.
by Alexandre Julliard 18 Jul '06

18 Jul '06

Module: wine Branch: refs/heads/master Commit: 9a9a14d4f5d6a47da281b397c630e4e9b7e789eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a9a14d4f5d6a47da281b39… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jul 17 22:23:40 2006 +0200 wined3d: Disable the fog before writing the back buffer data. --- 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 f28561e..fa4f615 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1091,6 +1091,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp that helps performance */ glDisable(GL_BLEND); glDisable(GL_DEPTH_TEST); + glDisable(GL_FOG); switch(wined3d_settings.rendertargetlock_mode) { case RTL_AUTO: @@ -1122,6 +1123,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp if(myDevice->stateBlock->renderState[D3DRS_ZENABLE] == D3DZB_TRUE || myDevice->stateBlock->renderState[D3DRS_ZENABLE] == D3DZB_USEW) glEnable(GL_DEPTH_TEST); if (myDevice->stateBlock->renderState[D3DRS_ALPHABLENDENABLE]) glEnable(GL_BLEND); + if (myDevice->stateBlock->renderState[D3DRS_FOGENABLE]) glEnable(GL_FOG); LEAVE_GL();

1 0

Stefan Dösinger : wined3d: Add a setting for the render target locking method.
by Alexandre Julliard 18 Jul '06

18 Jul '06

Module: wine Branch: refs/heads/master Commit: 739d565c59c351a779c3fb655eecf2e90fc99997 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=739d565c59c351a779c3fb6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 17 20:14:25 2006 +0200 wined3d: Add a setting for the render target locking method. --- dlls/wined3d/surface.c | 46 ++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_main.c | 33 +++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 8 +++++++ 3 files changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2efd65f..f28561e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -727,7 +727,28 @@ static HRESULT WINAPI IWineD3DSurfaceImp * (char *)pLockedRect->pBits + (pLockedRect->Pitch * (j-This->lockedRect.top))); *****************************************/ if (!notInContext) { /* Only read the buffer if it's in the current context */ - read_from_framebuffer(This, &This->lockedRect, pLockedRect->pBits, pLockedRect->Pitch); + switch(wined3d_settings.rendertargetlock_mode) { + case RTL_AUTO: + case RTL_READDRAW: + case RTL_READTEX: + read_from_framebuffer(This, &This->lockedRect, pLockedRect->pBits, pLockedRect->Pitch); + break; + + case RTL_TEXDRAW: + case RTL_TEXTEX: + ERR("Reading from render target with a texture isn't implemented yet\n"); + break; + + case RTL_DISABLE: + { + static BOOL warned = FALSE; + if(!warned) { + ERR("Application tries to lock the render target, but render target locking is disabled\n"); + warned = TRUE; + } + } + break; + } } TRACE("Resetting buffer\n"); @@ -1071,7 +1092,28 @@ static HRESULT WINAPI IWineD3DSurfaceImp glDisable(GL_BLEND); glDisable(GL_DEPTH_TEST); - flush_to_framebuffer_drawpixels(This); + switch(wined3d_settings.rendertargetlock_mode) { + case RTL_AUTO: + case RTL_READDRAW: + case RTL_TEXDRAW: + flush_to_framebuffer_drawpixels(This); + break; + + case RTL_READTEX: + case RTL_TEXTEX: + ERR("Writing to the render target with textures is not implemented yet\n"); + break; + + case RTL_DISABLE: + { + static BOOL warned = FALSE; + if(!warned) { + ERR("The application tries to write to the render target, but render target locking is disabled\n"); + warned = TRUE; + } + } + break; + } if(implSwapChain->backBuffer && implSwapChain->backBuffer[0]) { glDrawBuffer(GL_BACK); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 9f984b0..1021932 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -36,8 +36,9 @@ wined3d_settings_t wined3d_settings = { VS_HW, /* Hardware by default */ PS_NONE, /* Disabled by default */ - VBO_HW, /* Hardware by default */ - FALSE /* Use of GLSL disabled by default */ + VBO_HW, /* Hardware by default */ + FALSE, /* Use of GLSL disabled by default */ + RTL_AUTO /* Automatically determine best locking method */ }; WineD3DGlobalStatistics *wineD3DGlobalStatistics = NULL; @@ -196,6 +197,34 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, } /* There will be a couple of other choices for nonpow2, they are: TextureRecrangle and OpenGL 2 */ } + if ( !get_config_key( hkey, appkey, "RenderTargetLockMode", buffer, size) ) + { + if (!strcmp(buffer,"disabled")) + { + TRACE("Disabling render target locking\n"); + wined3d_settings.rendertargetlock_mode = RTL_DISABLE; + } + else if (!strcmp(buffer,"readdraw")) + { + TRACE("Using glReadPixels for render target reading and glDrawPixels for writing\n"); + wined3d_settings.rendertargetlock_mode = RTL_READDRAW; + } + else if (!strcmp(buffer,"readtex")) + { + TRACE("Using glReadPixels for render target reading and textures for writing\n"); + wined3d_settings.rendertargetlock_mode = RTL_READTEX; + } + else if (!strcmp(buffer,"texdraw")) + { + TRACE("Using textures for render target reading and glDrawPixels for writing\n"); + wined3d_settings.rendertargetlock_mode = RTL_TEXDRAW; + } + else if (!strcmp(buffer,"textex")) + { + TRACE("Reading render targets via textures and writing via textures\n"); + wined3d_settings.rendertargetlock_mode = RTL_TEXTEX; + } + } } if (wined3d_settings.vs_mode == VS_HW) TRACE("Allow HW vertex shaders\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 03ce7d7..9e83ddd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -138,6 +138,13 @@ #define SHADER_ARB 1 #define SHADER_GLSL 2 #define SHADER_NONE 3 +#define RTL_DISABLE -1 +#define RTL_AUTO 0 +#define RTL_READDRAW 1 +#define RTL_READTEX 2 +#define RTL_TEXDRAW 3 +#define RTL_TEXTEX 4 + typedef struct wined3d_settings_s { /* vertex and pixel shader modes */ int vs_mode; @@ -151,6 +158,7 @@ typedef struct wined3d_settings_s { int ps_selected_mode; /* nonpower 2 function */ int nonpower2_mode; + int rendertargetlock_mode; } wined3d_settings_t; extern wined3d_settings_t wined3d_settings;

1 0

Hwang YunSong(황윤성) : cmdlgtst: Updated Korean resource.
by Alexandre Julliard 18 Jul '06

18 Jul '06

Module: wine Branch: refs/heads/master Commit: dc338844aab73b4b2397cf7889d4cf6980c7c02e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc338844aab73b4b2397cf7… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Jul 18 08:54:07 2006 +0900 cmdlgtst: Updated Korean resource. --- programs/cmdlgtst/Ko.rc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/cmdlgtst/Ko.rc b/programs/cmdlgtst/Ko.rc index da9a212..6bc8db7 100644 --- a/programs/cmdlgtst/Ko.rc +++ b/programs/cmdlgtst/Ko.rc @@ -40,21 +40,21 @@ CmdlgtstMenu MENU MENUITEM "�ؽ�Ʈ ã��(&T)", CM_U_FIND MENUITEM "�ؽ�Ʈ �ٲٱ�(&R)", CM_U_REPLACE MENUITEM SEPARATOR - MENUITEM "�μ�(&r)", CM_U_PRINT - MENUITEM "�μ� ��(&g)", CM_U_PAGESETUP + MENUITEM "�μ�(&R)", CM_U_PRINT + MENUITEM "�μ� ��(&G)", CM_U_PAGESETUP } - POPUP "�÷��(&l)" + POPUP "�÷��(&L)" { - MENUITEM "��(&e)", CM_F_FILE + MENUITEM "��(&E)", CM_F_FILE MENUITEM SEPARATOR MENUITEM "��(&C)", CM_F_COLOR MENUITEM "�۲�(&F)", CM_F_FONT MENUITEM SEPARATOR MENUITEM "ã��/�ٲٱ�(&R)", CM_F_FINDREPLACE MENUITEM SEPARATOR - MENUITEM "�μ�(&r)", CM_F_PRINT - MENUITEM "�μ� ��(&g)", CM_F_PAGESETUP + MENUITEM "�μ�(&R)", CM_F_PRINT + MENUITEM "�μ� ��(&G)", CM_F_PAGESETUP } POPUP "��(&H)" @@ -254,15 +254,15 @@ BEGIN AUTORADIOBUTTON "��(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "��(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "��ڸ�", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "��(&e):", stc15, 88, 172, 21, 8 + LTEXT "��(&E):", stc15, 88, 172, 21, 8 EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "��(&R):", stc16, 159, 172, 27, 8 EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "��(&o):", stc17, 88, 192, 21, 8 + LTEXT "��(&O):", stc17, 88, 192, 21, 8 EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "�Ʒ�(&B):", stc18, 159, 192, 23, 8 EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "Ȯ��", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "��", IDCANCEL, 126, 220, 50, 14 - PUSHBUTTON " ��(&r)...", psh3, 184, 220, 48, 14 + PUSHBUTTON " ��(&R)...", psh3, 184, 220, 48, 14 END

1 0

Stefan Dösinger : wined3d: Break the glDrawPixels call out of UnlockRect.
by Alexandre Julliard 18 Jul '06

18 Jul '06

Module: wine Branch: refs/heads/master Commit: f8ca32b3fb9d1e50de011f0dce77eac9b34cd66f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8ca32b3fb9d1e50de011f0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 17 17:27:19 2006 +0200 wined3d: Break the glDrawPixels call out of UnlockRect. --- dlls/wined3d/surface.c | 378 +++++++++++++++++++++++++++++------------------- 1 files changed, 226 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f8ca32b3fb9d1e50de0…

1 0

Juan Lang : crypt32: Fix reading key prov info from serialized data.
by Alexandre Julliard 18 Jul '06

18 Jul '06

Module: wine Branch: refs/heads/master Commit: 30bf5d9adb55dc0879e47a9790961b4bc3507ad8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=30bf5d9adb55dc0879e47a9… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jul 17 23:02:57 2006 -0700 crypt32: Fix reading key prov info from serialized data. --- dlls/crypt32/cert.c | 7 +------ dlls/crypt32/crypt32_private.h | 8 ++++++++ dlls/crypt32/serialize.c | 10 ++++++++++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b5d510d..6297e72 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -244,12 +244,7 @@ static BOOL WINAPI CertContext_GetProper return ret; } -/* info is assumed to be a CRYPT_KEY_PROV_INFO, followed by its container name, - * provider name, and any provider parameters, in a contiguous buffer, but - * where info's pointers are assumed to be invalid. Upon return, info's - * pointers point to the appropriate memory locations. - */ -static void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) +void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) { DWORD i, containerLen, provNameLen; LPBYTE data = (LPBYTE)info + sizeof(CRYPT_KEY_PROV_INFO); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 3ef44b4..99c1dfe 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -97,6 +97,14 @@ extern PCWINE_CONTEXT_INTERFACE pCTLInte const void *CRYPT_ReadSerializedElement(const BYTE *pbElement, DWORD cbElement, DWORD dwContextTypeFlags, DWORD *pdwContentType); +/* Fixes up the the pointers in info, where info is assumed to be a + * CRYPT_KEY_PROV_INFO, followed by its container name, provider name, and any + * provider parameters, in a contiguous buffer, but where info's pointers are + * assumed to be invalid. Upon return, info's pointers point to the + * appropriate memory locations. + */ +void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info); + DWORD CertStore_GetAccessState(HCERTSTORE hCertStore); /** diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index b0765a7..afcd13f 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -363,6 +363,16 @@ const void *CRYPT_ReadSerializedElement( ret = contextInterface->setProp(context, hdr->propID, 0, pbElement); break; + case CERT_KEY_PROV_INFO_PROP_ID: + { + PCRYPT_KEY_PROV_INFO info = + (PCRYPT_KEY_PROV_INFO)pbElement; + + CRYPT_FixKeyProvInfoPointers(info); + ret = contextInterface->setProp(context, + hdr->propID, 0, pbElement); + break; + } default: FIXME("prop ID %ld: stub\n", hdr->propID); }

1 0

Juan Lang : crypt32: Output x.500 strings from CertNameToStrA/W.
by Alexandre Julliard 18 Jul '06

18 Jul '06

Module: wine Branch: refs/heads/master Commit: 8d8520975fa0b1a6b9ec5198ae6b3524f77ef1c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d8520975fa0b1a6b9ec519… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jul 17 11:50:20 2006 -0700 crypt32: Output x.500 strings from CertNameToStrA/W. --- dlls/crypt32/str.c | 153 +++++++++++++++++++++++++++++++++++++--------- dlls/crypt32/tests/str.c | 3 + 2 files changed, 126 insertions(+), 30 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index a80301e..ef67a9a 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -109,6 +109,30 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dw return ret; } +/* Adds the prefix prefix to the string pointed to by psz, followed by the + * character '='. Copies no more than csz characters. Returns the number of + * characters copied. If psz is NULL, returns the number of characters that + * would be copied. + */ +static DWORD CRYPT_AddPrefixA(LPCSTR prefix, LPSTR psz, DWORD csz) +{ + DWORD chars = min(lstrlenA(prefix), csz); + + TRACE("(%s, %p, %ld)\n", debugstr_a(prefix), psz, csz); + + if (psz && chars) + memcpy(psz, prefix, chars); + csz -= chars; + if (csz > 1) + { + if (psz) + *(psz + chars) = '='; + chars++; + csz--; + } + return chars; +} + DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, DWORD dwStrType, LPSTR psz, DWORD csz) { @@ -152,25 +176,33 @@ DWORD WINAPI CertNameToStrA(DWORD dwCert for (j = 0; ret < csz && j < info->rgRDN[i].cRDNAttr; j++) { DWORD chars; + char prefixBuf[10]; /* big enough for GivenName */ + LPCSTR prefix = NULL; if ((dwStrType & 0x000000ff) == CERT_OID_NAME_STR) + prefix = info->rgRDN[i].rgRDNAttr[j].pszObjId; + else if ((dwStrType & 0x000000ff) == CERT_X500_NAME_STR) + { + PCCRYPT_OID_INFO oidInfo = CryptFindOIDInfo( + CRYPT_OID_INFO_OID_KEY, + info->rgRDN[i].rgRDNAttr[j].pszObjId, + CRYPT_RDN_ATTR_OID_GROUP_ID); + + if (oidInfo) + { + WideCharToMultiByte(CP_ACP, 0, oidInfo->pwszName, -1, + prefixBuf, sizeof(prefixBuf), NULL, NULL); + prefix = prefixBuf; + } + else + prefix = info->rgRDN[i].rgRDNAttr[j].pszObjId; + } + if (prefix) { /* - 1 is needed to account for the NULL terminator. */ - chars = min( - lstrlenA(info->rgRDN[i].rgRDNAttr[j].pszObjId), - csz - ret - 1); - if (psz && chars) - memcpy(psz + ret, info->rgRDN[i].rgRDNAttr[j].pszObjId, - chars); + chars = CRYPT_AddPrefixA(prefix, psz + ret, csz - ret - 1); ret += chars; csz -= chars; - if (csz > 1) - { - if (psz) - *(psz + ret) = '='; - ret++; - csz--; - } } /* FIXME: handle quoting */ chars = CertRDNValueToStrA( @@ -206,6 +238,60 @@ DWORD WINAPI CertNameToStrA(DWORD dwCert return ret; } +/* Adds the prefix prefix to the wide-character string pointed to by psz, + * followed by the character '='. Copies no more than csz characters. Returns + * the number of characters copied. If psz is NULL, returns the number of + * characters that would be copied. + * Assumes the characters in prefix are ASCII (not multibyte characters.) + */ +static DWORD CRYPT_AddPrefixAToW(LPCSTR prefix, LPWSTR psz, DWORD csz) +{ + DWORD chars = min(lstrlenA(prefix), csz); + + TRACE("(%s, %p, %ld)\n", debugstr_a(prefix), psz, csz); + + if (psz && chars) + { + DWORD i; + + for (i = 0; i < chars; i++) + *(psz + i) = prefix[i]; + } + csz -= chars; + if (csz > 1) + { + if (psz) + *(psz + chars) = '='; + chars++; + csz--; + } + return chars; +} + +/* Adds the prefix prefix to the string pointed to by psz, followed by the + * character '='. Copies no more than csz characters. Returns the number of + * characters copied. If psz is NULL, returns the number of characters that + * would be copied. + */ +static DWORD CRYPT_AddPrefixW(LPCWSTR prefix, LPWSTR psz, DWORD csz) +{ + DWORD chars = min(lstrlenW(prefix), csz); + + TRACE("(%s, %p, %ld)\n", debugstr_w(prefix), psz, csz); + + if (psz && chars) + memcpy(psz, prefix, chars * sizeof(WCHAR)); + csz -= chars; + if (csz > 1) + { + if (psz) + *(psz + chars) = '='; + chars++; + csz--; + } + return chars; +} + DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, DWORD dwStrType, LPWSTR psz, DWORD csz) { @@ -249,30 +335,37 @@ DWORD WINAPI CertNameToStrW(DWORD dwCert for (j = 0; ret < csz && j < info->rgRDN[i].cRDNAttr; j++) { DWORD chars; + LPCSTR prefixA = NULL; + LPCWSTR prefixW = NULL; if ((dwStrType & 0x000000ff) == CERT_OID_NAME_STR) + prefixA = info->rgRDN[i].rgRDNAttr[j].pszObjId; + else if ((dwStrType & 0x000000ff) == CERT_X500_NAME_STR) + { + PCCRYPT_OID_INFO oidInfo = CryptFindOIDInfo( + CRYPT_OID_INFO_OID_KEY, + info->rgRDN[i].rgRDNAttr[j].pszObjId, + CRYPT_RDN_ATTR_OID_GROUP_ID); + + if (oidInfo) + prefixW = oidInfo->pwszName; + else + prefixA = info->rgRDN[i].rgRDNAttr[j].pszObjId; + } + if (prefixW) + { + /* - 1 is needed to account for the NULL terminator. */ + chars = CRYPT_AddPrefixW(prefixW, psz + ret, csz - ret - 1); + ret += chars; + csz -= chars; + } + else if (prefixA) { /* - 1 is needed to account for the NULL terminator. */ - chars = min( - lstrlenA(info->rgRDN[i].rgRDNAttr[j].pszObjId), + chars = CRYPT_AddPrefixAToW(prefixA, psz + ret, csz - ret - 1); - if (psz && chars) - { - DWORD k; - - for (k = 0; k < chars; k++) - *(psz + ret + k) = - info->rgRDN[i].rgRDNAttr[j].pszObjId[k]; - } ret += chars; csz -= chars; - if (csz > 1) - { - if (psz) - *(psz + ret) = '='; - ret++; - csz--; - } } /* FIXME: handle quoting */ chars = CertRDNValueToStrW( diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index c7c2e97..abece9c 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -118,6 +118,7 @@ static char subjectStrSemicolon[] = "2.5.4.6=US; 2.5.4.8=Minnesota; 2.5.4.7=Minneapolis; 2.5.4.10=CodeWeavers; 2.5.4.11=Wine Development; 2.5.4.3=localhost; 1.2.840.113549.1.9.1=aric(a)codeweavers.com"; static char subjectStrCRLF[] = "2.5.4.6=US\r\n2.5.4.8=Minnesota\r\n2.5.4.7=Minneapolis\r\n2.5.4.10=CodeWeavers\r\n2.5.4.11=Wine Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers…"; +static char x500SubjectStr[] = "C=US, S=Minnesota, L=Minneapolis, O=CodeWeavers, OU=Wine Development, CN=localhost, E=aric(a)codeweavers.com"; static WCHAR issuerStrW[] = { 'U','S',',',' ','M','i','n','n','e','s','o','t','a',',',' ','M','i','n','n', 'e','a','p','o','l','i','s',',',' ','C','o','d','e','W','e','a','v','e','r', @@ -349,6 +350,8 @@ static void test_CertNameToStrA(void) test_NameToStrConversionA(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_CRLF_FLAG, subjectStrCRLF); + test_NameToStrConversionA(&context->pCertInfo->Subject, + CERT_X500_NAME_STR, x500SubjectStr); CertFreeCertificateContext(context); }

1 0

Juan Lang : msi: Fix silly pointer error.
by Alexandre Julliard 18 Jul '06

18 Jul '06

Module: wine Branch: refs/heads/master Commit: 9e7f182871b4e79d0a1092bf4f439ef5c3d885e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e7f182871b4e79d0a1092b… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jul 17 10:12:10 2006 -0700 msi: Fix silly pointer error. --- dlls/msi/appsearch.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 98b9b06..bea0c29 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -957,13 +957,13 @@ UINT ACTION_AppSearch(MSIPACKAGE *packag if (rc == ERROR_SUCCESS) { rc = ACTION_AppSearchComponents(package, &value, &sig); - if (rc == ERROR_SUCCESS && !*value) + if (rc == ERROR_SUCCESS && !value) { rc = ACTION_AppSearchReg(package, &value, &sig); - if (rc == ERROR_SUCCESS && !*value) + if (rc == ERROR_SUCCESS && !value) { rc = ACTION_AppSearchIni(package, &value, &sig); - if (rc == ERROR_SUCCESS && !*value) + if (rc == ERROR_SUCCESS && !value) rc = ACTION_AppSearchDr(package, &value, &sig); } }

1 0