January 2007 - Wine-Commits

Rob Shearman : wininet: Fix HTTP_EncodeBasicAuth by passing an out buffer to the second set of character set conversion calls .
by Alexandre Julliard Jan. 17, 2007

Jan. 17, 2007

Module: wine Branch: master Commit: 1ec14b0b25209875b3ef5b3598d40672114a583a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ec14b0b25209875b3ef5b359… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 16 14:44:54 2007 -0600 wininet: Fix HTTP_EncodeBasicAuth by passing an out buffer to the second set of character set conversion calls. --- dlls/wininet/http.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index dd56560..fa2b82f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -900,10 +900,10 @@ static LPWSTR HTTP_EncodeBasicAuth( LPCW char *in; LPWSTR out; static const WCHAR szBasic[] = {'B','a','s','i','c',' ',0}; + int userlen = WideCharToMultiByte(CP_UTF8, 0, username, lstrlenW(username), NULL, 0, NULL, NULL); + int passlen = WideCharToMultiByte(CP_UTF8, 0, password, lstrlenW(password), NULL, 0, NULL, NULL); - len = WideCharToMultiByte(CP_UTF8, 0, username, lstrlenW(username), NULL, 0, NULL, NULL) + - 1 + WideCharToMultiByte(CP_UTF8, 0, password, lstrlenW(password), NULL, 0, NULL, NULL); - in = HeapAlloc( GetProcessHeap(), 0, (len+1)*sizeof(CHAR) ); + in = HeapAlloc( GetProcessHeap(), 0, userlen + 1 + passlen ); if( !in ) return NULL; @@ -912,11 +912,11 @@ static LPWSTR HTTP_EncodeBasicAuth( LPCW out = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); if( out ) { - WideCharToMultiByte(CP_UTF8, 0, username, -1, NULL, 0, NULL, NULL); - strcat(in, ":"); - WideCharToMultiByte(CP_UTF8, 0, password, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_UTF8, 0, username, -1, in, userlen, NULL, NULL); + in[userlen] = ':'; + WideCharToMultiByte(CP_UTF8, 0, password, -1, &in[userlen+1], passlen, NULL, NULL); lstrcpyW( out, szBasic ); - HTTP_EncodeBase64( in, len, &out[strlenW(out)] ); + HTTP_EncodeBase64( in, userlen + 1 + passlen, &out[strlenW(out)] ); } HeapFree( GetProcessHeap(), 0, in );

1 0

Stefan Dösinger : wined3d: Store the stream number in the strided structure.
by Alexandre Julliard Jan. 17, 2007

Jan. 17, 2007

Module: wine Branch: master Commit: 1d3abdeeaa32766a2506d3b99f8ad24a038e1064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3abdeeaa32766a2506d3b99… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 16 23:58:29 2007 +0100 wined3d: Store the stream number in the strided structure. --- dlls/ddraw/device.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/drawprim.c | 15 ++++++++++++--- dlls/wined3d/wined3d_private.h | 3 ++- include/wine/wined3d_types.h | 1 + 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 62cfa50..d0f81f3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3281,6 +3281,7 @@ IDirect3DDeviceImpl_7_DrawPrimitiveStrid TRACE("(%p)->(%08x,%08x,%p,%08x,%08x): stub!\n", This, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags); + memset(&WineD3DStrided, 0, sizeof(WineD3DStrided)); /* Get the strided data right. the wined3d structure is a bit bigger * Watch out: The contents of the strided data are determined by the fvf, * not by the members set in D3DDrawPrimStrideData. So it's valid @@ -3289,7 +3290,6 @@ IDirect3DDeviceImpl_7_DrawPrimitiveStrid */ if(VertexType & D3DFVF_POSITION_MASK) { - memset(&WineD3DStrided, 0, sizeof(WineD3DStrided)); WineD3DStrided.u.s.position.lpData = D3DDrawPrimStrideData->position.lpvData; WineD3DStrided.u.s.position.dwStride = D3DDrawPrimStrideData->position.dwStride; WineD3DStrided.u.s.position.dwType = WINED3DDECLTYPE_FLOAT3; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a77ccdc..bc4b2f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4098,7 +4098,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl } memset(&strided, 0, sizeof(strided)); - primitiveConvertFVFtoOffset(SrcImpl->fvf, get_flexible_vertex_size(SrcImpl->fvf), SrcImpl->resource.allocatedMemory + get_flexible_vertex_size(SrcImpl->fvf) * SrcStartIndex, &strided, 0); + primitiveConvertFVFtoOffset(SrcImpl->fvf, get_flexible_vertex_size(SrcImpl->fvf), SrcImpl->resource.allocatedMemory + get_flexible_vertex_size(SrcImpl->fvf) * SrcStartIndex, &strided, 0, 0); return process_vertices_strided(This, DestIndex, VertexCount, &strided, SrcImpl->fvf, (IWineD3DVertexBufferImpl *) pDestBuffer, Flags); } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f7df49c..400ffb5 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -223,6 +223,7 @@ void primitiveDeclarationConvertToStride strided->u.input[idx].dwType = element->Type; strided->u.input[idx].dwStride = stride; strided->u.input[idx].VBO = streamVBO; + strided->u.input[idx].streamNo = element->Stream; if (!useVertexShaderFunction) { if (element->Usage == D3DDECLUSAGE_POSITION) strided->u.s.position_transformed = FALSE; @@ -244,7 +245,7 @@ void primitiveDeclarationConvertToStride } } -void primitiveConvertFVFtoOffset(DWORD thisFVF, DWORD stride, BYTE *data, WineDirect3DVertexStridedData *strided, GLint streamVBO) { +void primitiveConvertFVFtoOffset(DWORD thisFVF, DWORD stride, BYTE *data, WineDirect3DVertexStridedData *strided, GLint streamVBO, UINT streamNo) { int numBlends; int numTextures; int textureNo; @@ -259,6 +260,7 @@ void primitiveConvertFVFtoOffset(DWORD t strided->u.s.position.dwType = WINED3DDECLTYPE_FLOAT3; strided->u.s.position.dwStride = stride; strided->u.s.position.VBO = streamVBO; + strided->u.s.position.streamNo = streamNo; data += 3 * sizeof(float); if (thisFVF & WINED3DFVF_XYZRHW) { strided->u.s.position.dwType = WINED3DDECLTYPE_FLOAT4; @@ -279,6 +281,7 @@ void primitiveConvertFVFtoOffset(DWORD t strided->u.s.blendWeights.dwType = WINED3DDECLTYPE_FLOAT1 + numBlends - 1; strided->u.s.blendWeights.dwStride = stride; strided->u.s.blendWeights.VBO = streamVBO; + strided->u.s.blendWeights.streamNo = streamNo; data += numBlends * sizeof(FLOAT); if (thisFVF & WINED3DFVF_LASTBETA_UBYTE4) { @@ -286,6 +289,7 @@ void primitiveConvertFVFtoOffset(DWORD t strided->u.s.blendMatrixIndices.dwType = WINED3DDECLTYPE_UBYTE4; strided->u.s.blendMatrixIndices.dwStride= stride; strided->u.s.blendMatrixIndices.VBO = streamVBO; + strided->u.s.blendMatrixIndices.streamNo= streamNo; data += sizeof(DWORD); } } @@ -295,7 +299,8 @@ void primitiveConvertFVFtoOffset(DWORD t strided->u.s.normal.lpData = data; strided->u.s.normal.dwType = WINED3DDECLTYPE_FLOAT3; strided->u.s.normal.dwStride = stride; - strided->u.s.normal.VBO = streamVBO; + strided->u.s.normal.VBO = streamVBO; + strided->u.s.normal.streamNo = streamNo; data += 3 * sizeof(FLOAT); } @@ -305,6 +310,7 @@ void primitiveConvertFVFtoOffset(DWORD t strided->u.s.pSize.dwType = WINED3DDECLTYPE_FLOAT1; strided->u.s.pSize.dwStride = stride; strided->u.s.pSize.VBO = streamVBO; + strided->u.s.pSize.streamNo = streamNo; data += sizeof(FLOAT); } @@ -314,6 +320,7 @@ void primitiveConvertFVFtoOffset(DWORD t strided->u.s.diffuse.dwType = WINED3DDECLTYPE_SHORT4; strided->u.s.diffuse.dwStride = stride; strided->u.s.diffuse.VBO = streamVBO; + strided->u.s.diffuse.streamNo = streamNo; data += sizeof(DWORD); } @@ -323,6 +330,7 @@ void primitiveConvertFVFtoOffset(DWORD t strided->u.s.specular.dwType = WINED3DDECLTYPE_SHORT4; strided->u.s.specular.dwStride = stride; strided->u.s.specular.VBO = streamVBO; + strided->u.s.specular.streamNo = streamNo; data += sizeof(DWORD); } @@ -343,6 +351,7 @@ void primitiveConvertFVFtoOffset(DWORD t strided->u.s.texCoords[textureNo].dwType = WINED3DDECLTYPE_FLOAT1; strided->u.s.texCoords[textureNo].dwStride = stride; strided->u.s.texCoords[textureNo].VBO = streamVBO; + strided->u.s.texCoords[textureNo].streamNo = streamNo; numCoords[textureNo] = coordIdxInfo & 0x03; /* Always one set */ @@ -420,7 +429,7 @@ void primitiveConvertToStridedData(IWine if (thisFVF == 0) continue; /* Now convert the stream into pointers */ - primitiveConvertFVFtoOffset(thisFVF, stride, data, strided, streamVBO); + primitiveConvertFVFtoOffset(thisFVF, stride, data, strided, streamVBO, nStream); } /* Now call PreLoad on all the vertex buffers. In the very rare case * that the buffers stopps converting PreLoad will dirtify the VDECL again. diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6b4c42a..529bada 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -396,7 +396,8 @@ void primitiveConvertFVFtoOffset(DWORD t DWORD stride, BYTE *data, WineDirect3DVertexStridedData *strided, - GLint streamVBO); + GLint streamVBO, + UINT streamNo); DWORD get_flexible_vertex_size(DWORD d3dvtVertexType); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 2f75be6..a75c4d4 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1252,6 +1252,7 @@ typedef struct WineDirect3DStridedData { DWORD dwStride; /* Stride between occurances of this data */ DWORD dwType; /* Type (as in D3DVSDT_TYPE) */ int VBO; /* Vertex buffer object this data is in */ + UINT streamNo; /* D3D stream number */ } WineDirect3DStridedData; typedef struct WineDirect3DVertexStridedData {

1 0

Stefan Dösinger : wined3d: Implement per stream offsets.
by Alexandre Julliard Jan. 17, 2007

Jan. 17, 2007

Module: wine Branch: master Commit: 354fdae524a02655eaecaa95f0bf6f04713bd7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=354fdae524a02655eaecaa95f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 17 00:06:34 2007 +0100 wined3d: Implement per stream offsets. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/drawprim.c | 47 +++++++++++++++++++++++++++++++++++++---------- dlls/wined3d/state.c | 22 ++++++++++++---------- 3 files changed, 50 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=354fdae524a02655eaeca…

1 0

Andrew Talbot : netapi32: Declare a variable static.
by Alexandre Julliard Jan. 17, 2007

Jan. 17, 2007

Module: wine Branch: master Commit: 9d70a6ee2caf36d66f1154760fe056919d14234b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d70a6ee2caf36d66f1154760… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Jan 16 21:11:37 2007 +0000 netapi32: Declare a variable static. --- dlls/netapi32/netapi32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index d583353..a1cef9f 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(netbios); -HMODULE NETAPI32_hModule = 0; +static HMODULE NETAPI32_hModule; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {

1 0

Stefan Dösinger : wined3d: Improve drawStridedSlow a bit.
by Alexandre Julliard Jan. 17, 2007

Jan. 17, 2007

Module: wine Branch: master Commit: 71f923a6d20785ebd43bae9186f62c0029ca0db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f923a6d20785ebd43bae918… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 16 23:43:28 2007 +0100 wined3d: Improve drawStridedSlow a bit. --- dlls/wined3d/drawprim.c | 123 ++++++++++++++++------------------------------ 1 files changed, 43 insertions(+), 80 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b46192e..f7df49c 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -615,9 +615,7 @@ static void drawStridedSlow(IWineD3DDevi const long *pIdxBufL = NULL; LONG vx_index; float x = 0.0f, y = 0.0f, z = 0.0f; /* x,y,z coordinates */ - float nx = 0.0f, ny = 0.0, nz = 0.0f; /* normal x,y,z coordinates */ float rhw = 0.0f; /* rhw */ - float ptSize = 0.0f; /* Point size */ DWORD diffuseColor = 0xFFFFFFFF; /* Diffuse Color */ DWORD specularColor = 0; /* Specular Color */ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -635,6 +633,19 @@ static void drawStridedSlow(IWineD3DDevi VTRACE(("glBegin(%x)\n", glPrimType)); glBegin(glPrimType); + /* Default settings for data that is not passed */ + if (sd->u.s.normal.lpData == NULL) { + glNormal3f(0, 0, 1); + } + if(sd->u.s.diffuse.lpData != NULL) { + glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + } + if(sd->u.s.specular.lpData != NULL) { + if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { + GL_EXTCALL(glSecondaryColor3fEXT)(0, 0, 0); + } + } + /* We shouldn't start this function if any VBO is involved. Should I put a safety check here? * Guess it's not necessary(we crash then anyway) and would only eat CPU time */ @@ -645,6 +656,10 @@ static void drawStridedSlow(IWineD3DDevi /* Initialize diffuse color */ diffuseColor = 0xFFFFFFFF; + /* Blending data and Point sizes are not supported by this function. They are not supported by the fixed + * function pipeline at all. A Fixme for them is printed after decoding the vertex declaration + */ + /* For indexed data, we need to go a few more strides in */ if (idxData != NULL) { @@ -658,68 +673,6 @@ static void drawStridedSlow(IWineD3DDevi } } - /* Position Information ------------------ */ - if (sd->u.s.position.lpData != NULL) { - - float *ptrToCoords = (float *)(sd->u.s.position.lpData + (SkipnStrides * sd->u.s.position.dwStride)); - x = ptrToCoords[0]; - y = ptrToCoords[1]; - z = ptrToCoords[2]; - rhw = 1.0; - VTRACE(("x,y,z=%f,%f,%f\n", x,y,z)); - - /* RHW follows, only if transformed, ie 4 floats were provided */ - if (sd->u.s.position_transformed) { - rhw = ptrToCoords[3]; - VTRACE(("rhw=%f\n", rhw)); - } - } - - /* Blending data -------------------------- */ - if (sd->u.s.blendWeights.lpData != NULL) { - /* float *ptrToCoords = (float *)(sd->u.s.blendWeights.lpData + (SkipnStrides * sd->u.s.blendWeights.dwStride)); */ - FIXME("Blending not supported yet\n"); - - if (sd->u.s.blendMatrixIndices.lpData != NULL) { - /*DWORD *ptrToCoords = (DWORD *)(sd->u.s.blendMatrixIndices.lpData + (SkipnStrides * sd->u.s.blendMatrixIndices.dwStride));*/ - } - } - - /* Vertex Normal Data (untransformed only)- */ - if (sd->u.s.normal.lpData != NULL) { - - float *ptrToCoords = (float *)(sd->u.s.normal.lpData + (SkipnStrides * sd->u.s.normal.dwStride)); - nx = ptrToCoords[0]; - ny = ptrToCoords[1]; - nz = ptrToCoords[2]; - VTRACE(("nx,ny,nz=%f,%f,%f\n", nx, ny, nz)); - } - - /* Point Size ----------------------------- */ - if (sd->u.s.pSize.lpData != NULL) { - - float *ptrToCoords = (float *)(sd->u.s.pSize.lpData + (SkipnStrides * sd->u.s.pSize.dwStride)); - ptSize = ptrToCoords[0]; - VTRACE(("ptSize=%f\n", ptSize)); - FIXME("No support for ptSize yet\n"); - } - - /* Diffuse -------------------------------- */ - if (sd->u.s.diffuse.lpData != NULL) { - - DWORD *ptrToCoords = (DWORD *)(sd->u.s.diffuse.lpData + (SkipnStrides * sd->u.s.diffuse.dwStride)); - diffuseColor = ptrToCoords[0]; - VTRACE(("diffuseColor=%lx\n", diffuseColor)); - } - - /* Specular -------------------------------- */ - if (sd->u.s.specular.lpData != NULL) { - - DWORD *ptrToCoords = (DWORD *)(sd->u.s.specular.lpData + (SkipnStrides * sd->u.s.specular.dwStride)); - specularColor = ptrToCoords[0]; - VTRACE(("specularColor=%lx\n", specularColor)); - } - /* Texture coords --------------------------- */ for (textureNo = 0, texture_idx = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { @@ -835,7 +788,11 @@ static void drawStridedSlow(IWineD3DDevi /* Diffuse -------------------------------- */ if (sd->u.s.diffuse.lpData != NULL) { - glColor4ub(D3DCOLOR_B_R(diffuseColor), + DWORD *ptrToCoords = (DWORD *)(sd->u.s.diffuse.lpData + (SkipnStrides * sd->u.s.diffuse.dwStride)); + diffuseColor = ptrToCoords[0]; + VTRACE(("diffuseColor=%lx\n", diffuseColor)); + + glColor4ub(D3DCOLOR_B_R(diffuseColor), D3DCOLOR_B_G(diffuseColor), D3DCOLOR_B_B(diffuseColor), D3DCOLOR_B_A(diffuseColor)); @@ -844,12 +801,14 @@ static void drawStridedSlow(IWineD3DDevi D3DCOLOR_B_G(diffuseColor), D3DCOLOR_B_B(diffuseColor), D3DCOLOR_B_A(diffuseColor))); - } else { - if (vx_index == 0) glColor4f(1.0f, 1.0f, 1.0f, 1.0f); } /* Specular ------------------------------- */ if (sd->u.s.specular.lpData != NULL) { + DWORD *ptrToCoords = (DWORD *)(sd->u.s.specular.lpData + (SkipnStrides * sd->u.s.specular.dwStride)); + specularColor = ptrToCoords[0]; + VTRACE(("specularColor=%lx\n", specularColor)); + /* special case where the fog density is stored in the diffuse alpha channel */ if(This->stateBlock->renderState[WINED3DRS_FOGENABLE] && (This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] == WINED3DFOG_NONE || sd->u.s.position.dwType == WINED3DDECLTYPE_FLOAT4 )&& @@ -879,27 +838,31 @@ static void drawStridedSlow(IWineD3DDevi /* Do not worry if specular colour missing and disable request */ VTRACE(("Specular color extensions not supplied\n")); } - } else { - if (vx_index == 0) { - if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { - GL_EXTCALL(glSecondaryColor3fEXT)(0, 0, 0); - } else { - /* Do not worry if specular colour missing and disable request */ - VTRACE(("Specular color extensions not supplied\n")); - } - } } /* Normal -------------------------------- */ if (sd->u.s.normal.lpData != NULL) { - VTRACE(("glNormal:nx,ny,nz=%f,%f,%f\n", nx,ny,nz)); - glNormal3f(nx, ny, nz); - } else { - if (vx_index == 0) glNormal3f(0, 0, 1); + float *ptrToCoords = (float *)(sd->u.s.normal.lpData + (SkipnStrides * sd->u.s.normal.dwStride)); + + VTRACE(("glNormal:nx,ny,nz=%f,%f,%f\n", ptrToCoords[0], ptrToCoords[1], ptrToCoords[2])); + glNormal3f(ptrToCoords[0], ptrToCoords[1], ptrToCoords[2]); } /* Position -------------------------------- */ if (sd->u.s.position.lpData != NULL) { + float *ptrToCoords = (float *)(sd->u.s.position.lpData + (SkipnStrides * sd->u.s.position.dwStride)); + x = ptrToCoords[0]; + y = ptrToCoords[1]; + z = ptrToCoords[2]; + rhw = 1.0; + VTRACE(("x,y,z=%f,%f,%f\n", x,y,z)); + + /* RHW follows, only if transformed, ie 4 floats were provided */ + if (sd->u.s.position_transformed) { + rhw = ptrToCoords[3]; + VTRACE(("rhw=%f\n", rhw)); + } + if (1.0f == rhw || ((rhw < eps) && (rhw > -eps))) { VTRACE(("Vertex: glVertex:x,y,z=%f,%f,%f\n", x,y,z)); glVertex3f(x, y, z);

1 0

Alasdair Sinclair : msvcrt: If we' re at EOF in the buffer and we have pattern %n in format string we should not count the EOF in the total .
by Alexandre Julliard Jan. 17, 2007

Jan. 17, 2007

Module: wine Branch: master Commit: 8137c094fdf37e9d101e52f114103bda55c5b3ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8137c094fdf37e9d101e52f11… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Wed Jan 17 04:14:27 2007 +0000 msvcrt: If we're at EOF in the buffer and we have pattern %n in format string we should not count the EOF in the total. --- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/tests/scanf.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 139f142..7fe3cc4 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -415,7 +415,7 @@ _FUNCTION_ { case 'n': { if (!suppress) { int*n = va_arg(ap, int*); - *n = consumed - (nch!=_EOF_); + *n = consumed - 1; } /* This is an odd one: according to the standard, * "Execution of a %n directive does not increment the diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 71e6e22..65bea46 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -162,6 +162,12 @@ static void test_sscanf( void ) ok(strcmp(buffer1,"def")==0, "Second %%s read incorrectly: %s\n", buffer1); ok(number_so_far==6, "%%n yielded wrong result: %d\n", number_so_far); ok(ret == 2, "%%n shouldn't count as a conversion: %d\n", ret); + + /* Check where %n matches to EOF in buffer */ + strcpy(buffer, "3:45"); + ret = sscanf(buffer, "%d:%d%n", &hour, &min, &number_so_far); + ok(ret == 2, "Wrong number of arguments read: %d\n", ret); + ok(number_so_far == 4, "%%n yielded wrong result: %d\n", number_so_far); } START_TEST(scanf)

1 0

Detlef Riekenberg : localspl: Implement PortIsValid for XcvDataPort.
by Alexandre Julliard Jan. 17, 2007

Jan. 17, 2007

Module: wine Branch: master Commit: 44570c118c5adc353722e213954490fa758566b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44570c118c5adc353722e2139… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jan 16 00:42:15 2007 +0100 localspl: Implement PortIsValid for XcvDataPort. --- dlls/localspl/localmon.c | 67 ++++++++++++++++++++++++++++++++++++++ dlls/localspl/localspl_private.h | 16 +++++++++ 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index fcf26f9..66d95cf 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -37,6 +37,7 @@ #include "wine/debug.h" #include "wine/list.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(localspl); @@ -65,8 +66,15 @@ static struct list xcv_handles = LIST_IN /* ############################### */ static const WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; +static const WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; static const WCHAR dllnameuiW[] = {'l','o','c','a','l','u','i','.','d','l','l',0}; +static const WCHAR portname_LPT[] = {'L','P','T',0}; +static const WCHAR portname_COM[] = {'C','O','M',0}; +static const WCHAR portname_FILE[] = {'F','I','L','E',':',0}; +static const WCHAR portname_CUPS[] = {'C','U','P','S',':',0}; +static const WCHAR portname_LPR[] = {'L','P','R',':',0}; + static const WCHAR WinNT_CV_PortsW[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', @@ -198,6 +206,52 @@ getports_cleanup: } /***************************************************** + * get_type_from_name (internal) + * + */ + +static DWORD get_type_from_name(LPCWSTR name) +{ + HANDLE hfile; + + if (!strncmpW(name, portname_LPT, sizeof(portname_LPT) / sizeof(WCHAR) -1)) + return PORT_IS_LPT; + + if (!strncmpW(name, portname_COM, sizeof(portname_COM) / sizeof(WCHAR) -1)) + return PORT_IS_COM; + + if (!strcmpW(name, portname_FILE)) + return PORT_IS_FILE; + + if (name[0] == '/') + return PORT_IS_UNIXNAME; + + if (name[0] == '|') + return PORT_IS_PIPE; + + if (!strncmpW(name, portname_CUPS, sizeof(portname_CUPS) / sizeof(WCHAR) -1)) + return PORT_IS_CUPS; + + if (!strncmpW(name, portname_LPR, sizeof(portname_LPR) / sizeof(WCHAR) -1)) + return PORT_IS_LPR; + + /* Must be a file or a directory. Does the file exist ? */ + hfile = CreateFileW(name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + TRACE("%p for OPEN_EXISTING on %s\n", hfile, debugstr_w(name)); + if (hfile == INVALID_HANDLE_VALUE) { + /* Can we create the file? */ + hfile = CreateFileW(name, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); + TRACE("%p for OPEN_ALWAYS\n", hfile); + } + if (hfile != INVALID_HANDLE_VALUE) { + CloseHandle(hfile); + return PORT_IS_FILENAME; + } + /* We can't use the name. use GetLastError() for the reason */ + return PORT_IS_UNKNOWN; +} + +/***************************************************** * localmon_ConfigurePortW [exported through MONITOREX] * * Display the Configuration-Dialog for a specific Port @@ -370,6 +424,7 @@ BOOL WINAPI localmon_XcvClosePort(HANDLE DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded) { + DWORD res; TRACE("(%p, %s, %p, %d, %p, %d, %p)\n", hXcv, debugstr_w(pszDataName), pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); @@ -383,6 +438,18 @@ DWORD WINAPI localmon_XcvDataPort(HANDLE } return ERROR_INSUFFICIENT_BUFFER; } + + if (!lstrcmpW(pszDataName, cmd_PortIsValidW)) { + TRACE("InputData (%d): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData)); + res = get_type_from_name((LPCWSTR) pInputData); + TRACE("detected as %u\n", res); + /* names, that we have recognized, are valid */ + if (res) return ERROR_SUCCESS; + + /* ERROR_ACCESS_DENIED, ERROR_PATH_NOT_FOUND ore something else */ + return GetLastError(); + } + FIXME("command not supported: %s\n", debugstr_w(pszDataName)); return ERROR_INVALID_PARAMETER; } diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 7633c93..7755858 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -35,6 +35,22 @@ extern HINSTANCE LOCALSPL_hInstance; #define IDS_LOCALPORT_MAXLEN 32 #define IDS_NOTHINGTOCONFIG_MAXLEN 80 +/* ## Type of Ports ## */ +/* windows types */ +#define PORT_IS_UNKNOWN 0 +#define PORT_IS_LPT 1 +#define PORT_IS_COM 2 +#define PORT_IS_FILE 3 +#define PORT_IS_FILENAME 4 + +/* wine extensions */ +#define PORT_IS_WINE 5 +#define PORT_IS_UNIXNAME 5 +#define PORT_IS_PIPE 6 +#define PORT_IS_CUPS 7 +#define PORT_IS_LPR 8 + + /* ## Memory allocation macros ## */ static inline void *spl_alloc( size_t len )

1 0

Detlef Riekenberg : localspl/tests: Extend test for XcvDataPort_MonitorUI.
by Alexandre Julliard Jan. 17, 2007

Jan. 17, 2007

Module: wine Branch: master Commit: 7ea06b59e9b02f58cb4e9787ca99eeb85c1cbebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea06b59e9b02f58cb4e9787c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jan 16 00:36:11 2007 +0100 localspl/tests: Extend test for XcvDataPort_MonitorUI. --- dlls/localspl/tests/localmon.c | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index edbd582..7a3464b 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -342,7 +342,7 @@ static void test_XcvClosePort(void) /* ########################### */ -static void test_XcvDataPort(void) +static void test_XcvDataPort_MonitorUI(void) { DWORD res; HANDLE hXcv; @@ -363,11 +363,20 @@ static void test_XcvDataPort(void) needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, NULL, 0, &needed); + if (res == ERROR_INVALID_PARAMETER) { + pXcvClosePort(hXcv); + skip("'MonitorUI' nor supported\n"); + return; + } ok( (res == ERROR_INSUFFICIENT_BUFFER) && (needed <= MAX_PATH), "returned %d with %u and 0x%x (expected 'ERROR_INSUFFICIENT_BUFFER' " " and '<= MAX_PATH')\n", res, GetLastError(), needed); - if (needed > MAX_PATH) goto xcv_cleanup; + if (needed > MAX_PATH) { + pXcvClosePort(hXcv); + skip("buffer overflow (%u)\n", needed); + return; + } len = needed; /* the command is required */ @@ -410,6 +419,7 @@ static void test_XcvDataPort(void) /* off by one: smaller */ + /* the buffer is not modified for NT4, w2k, XP */ needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len-1, &needed); @@ -424,7 +434,25 @@ static void test_XcvDataPort(void) ok( res == ERROR_SUCCESS, "returned %d with %u and 0x%x " "(expected 'ERROR_SUCCESS')\n", res, GetLastError(), needed); -xcv_cleanup: + + pXcvClosePort(hXcv); + + + /* small check without access-rights: */ + hXcv = (HANDLE) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvOpenPort(emptyW, 0, &hXcv); + ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (!res) return; + + /* The ACCESS_MASK is ignored for "MonitorUI" */ + memset(buffer, 0, len); + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, sizeof(buffer), &needed); + ok( res == ERROR_SUCCESS, "returned %d with %u and 0x%x " + "(expected 'ERROR_SUCCESS')\n", res, GetLastError(), needed); + pXcvClosePort(hXcv); } @@ -574,6 +602,6 @@ START_TEST(localmon) test_DeletePort(); test_EnumPorts(); test_XcvClosePort(); - test_XcvDataPort(); + test_XcvDataPort_MonitorUI(); test_XcvOpenPort(); }

1 0

Detlef Riekenberg : localspl: Implement XcvDataPort.
by Alexandre Julliard Jan. 17, 2007

Jan. 17, 2007

Module: wine Branch: master Commit: 3777163202bf6bd05f71e3e254ecd8552752eb8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3777163202bf6bd05f71e3e25… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jan 16 00:38:02 2007 +0100 localspl: Implement XcvDataPort. --- dlls/localspl/localmon.c | 52 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index e6dcf39..fcf26f9 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -64,6 +64,8 @@ static struct list xcv_handles = LIST_IN /* ############################### */ +static const WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; +static const WCHAR dllnameuiW[] = {'l','o','c','a','l','u','i','.','d','l','l',0}; static const WCHAR WinNT_CV_PortsW[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -338,6 +340,54 @@ BOOL WINAPI localmon_XcvClosePort(HANDLE } /***************************************************** + * localmon_XcvDataPort [exported through MONITOREX] + * + * Execute command through a Communication-Channel + * + * PARAMS + * hXcv [i] The Handle to work with + * pszDataName [i] Name of the command to execute + * pInputData [i] Buffer for extra Input Data (needed only for some commands) + * cbInputData [i] Size in Bytes of Buffer at pInputData + * pOutputData [o] Buffer to receive additional Data (needed only for some commands) + * cbOutputData [i] Size in Bytes of Buffer at pOutputData + * pcbOutputNeeded [o] PTR to receive the minimal Size in Bytes of the Buffer at pOutputData + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: win32 error code (same value is returned by GetLastError) + * + * NOTES + * + * Minimal List of commands, that every Printmonitor DLL should support: + * + *| "MonitorUI" : Return the Name of the Userinterface-DLL as WSTR in pOutputData + *| "AddPort" : Add a Port (Name as WSTR in pInputData) + *| "DeletePort": Delete a Port (Name as WSTR in pInputData) + * + * + */ +DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, + PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded) +{ + + TRACE("(%p, %s, %p, %d, %p, %d, %p)\n", hXcv, debugstr_w(pszDataName), + pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); + + + if (!lstrcmpW(pszDataName, cmd_MonitorUIW)) { + * pcbOutputNeeded = sizeof(dllnameuiW); + if (cbOutputData >= sizeof(dllnameuiW)) { + memcpy(pOutputData, dllnameuiW, sizeof(dllnameuiW)); + return ERROR_SUCCESS; + } + return ERROR_INSUFFICIENT_BUFFER; + } + FIXME("command not supported: %s\n", debugstr_w(pszDataName)); + return ERROR_INVALID_PARAMETER; +} + +/***************************************************** * localmon_XcvOpenPort [exported through MONITOREX] * * Open a Communication-Channel @@ -418,7 +468,7 @@ LPMONITOREX WINAPI InitializePrintMonito NULL, /* localmon_GetPrinterDataFromPort */ NULL, /* localmon_SetPortTimeOuts */ localmon_XcvOpenPort, - NULL, /* localmon_XcvDataPort */ + localmon_XcvDataPort, localmon_XcvClosePort } };

1 0

Detlef Riekenberg : localspl/tests: Add test for XcvDataPort_PortIsValid.
by Alexandre Julliard Jan. 17, 2007

Jan. 17, 2007

Module: wine Branch: master Commit: 9a3f4546b75cc6532596613be4a7e31658c7516b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a3f4546b75cc6532596613be… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jan 16 00:37:08 2007 +0100 localspl/tests: Add test for XcvDataPort_PortIsValid. --- dlls/localspl/tests/localmon.c | 176 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 175 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 7a3464b..a254a90 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -67,6 +67,7 @@ static BOOL (WINAPI *pDeletePortUI)(PCW static WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; static WCHAR cmd_MonitorUI_lcaseW[] = {'m','o','n','i','t','o','r','u','i',0}; +static WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; static WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; static WCHAR emptyW[] = {0}; static WCHAR Monitors_LocalPortW[] = { @@ -78,10 +79,15 @@ static WCHAR Monitors_LocalPortW[] = { 'L','o','c','a','l',' ','P','o','r','t',0}; static WCHAR portname_com1W[] = {'C','O','M','1',':',0}; +static WCHAR portname_com2W[] = {'C','O','M','2',':',0}; static WCHAR portname_fileW[] = {'F','I','L','E',':',0}; static WCHAR portname_lpt1W[] = {'L','P','T','1',':',0}; - +static WCHAR portname_lpt2W[] = {'L','P','T','2',':',0}; static WCHAR server_does_not_existW[] = {'\\','\\','d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; +static WCHAR wineW[] = {'W','i','n','e',0}; + +static WCHAR tempdirW[MAX_PATH]; +static WCHAR tempfileW[MAX_PATH]; /* ########################### */ @@ -459,6 +465,165 @@ static void test_XcvDataPort_MonitorUI(v /* ########################### */ +static void test_XcvDataPort_PortIsValid(void) +{ + DWORD res; + HANDLE hXcv; + DWORD needed; + + + if ((pXcvOpenPort == NULL) || (pXcvDataPort == NULL) || (pXcvClosePort == NULL)) return; + + hXcv = (HANDLE) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + ok(res, "hXcv: %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (!res) return; + + /* normal use: "LPT1:" */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, &needed); + if (res == ERROR_INVALID_PARAMETER) { + pXcvClosePort(hXcv); + skip("'PostIsValid' not supported\n"); + return; + } + ok( res == ERROR_SUCCESS, "returned %d with %u (expected ERROR_SUCCESS)\n", res, GetLastError()); + + + if (0) { + /* crash with native localspl.dll (w2k+xp) */ + res = pXcvDataPort(hXcv, cmd_PortIsValidW, NULL, 0, NULL, 0, &needed); + } + + + /* hXcv is ignored for the command "PortIsValid" */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(NULL, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, NULL); + ok( res == ERROR_SUCCESS, "returned %d with %u (expected ERROR_SUCCESS)\n", res, GetLastError()); + + /* needed is ignored */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, NULL); + ok( res == ERROR_SUCCESS, "returned %d with %u (expected ERROR_SUCCESS)\n", res, GetLastError()); + + + /* cbInputData is ignored */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, 0, NULL, 0, &needed); + ok( res == ERROR_SUCCESS, + "returned %d with %u and 0x%x (expected ERROR_SUCCESS)\n", + res, GetLastError(), needed); + + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, 1, NULL, 0, &needed); + ok( res == ERROR_SUCCESS, + "returned %d with %u and 0x%x (expected ERROR_SUCCESS)\n", + res, GetLastError(), needed); + + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W) -1, NULL, 0, &needed); + ok( res == ERROR_SUCCESS, + "returned %d with %u and 0x%x (expected ERROR_SUCCESS)\n", + res, GetLastError(), needed); + + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W) -2, NULL, 0, &needed); + ok( res == ERROR_SUCCESS, + "returned %d with %u and 0x%x (expected ERROR_SUCCESS)\n", + res, GetLastError(), needed); + + + /* an empty name is not allowed */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) emptyW, sizeof(emptyW), NULL, 0, &needed); + ok( res == ERROR_PATH_NOT_FOUND, + "returned %d with %u and 0x%x (expected ERROR_PATH_NOT_FOUND)\n", + res, GetLastError(), needed); + + + /* a directory is not allowed */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) tempdirW, (lstrlenW(tempdirW) + 1) * sizeof(WCHAR), NULL, 0, &needed); + /* XP(admin): ERROR_INVALID_NAME, XP(user): ERROR_PATH_NOT_FOUND, w2k ERROR_ACCESS_DENIED */ + ok( (res == ERROR_INVALID_NAME) || (res == ERROR_PATH_NOT_FOUND) || + (res == ERROR_ACCESS_DENIED), "returned %d with %u and 0x%x " + "(expected ERROR_INVALID_NAME, ERROR_PATH_NOT_FOUND or ERROR_ACCESS_DENIED)\n", + res, GetLastError(), needed); + + + /* test more valid well known Ports: */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt2W, sizeof(portname_lpt2W), NULL, 0, &needed); + ok( res == ERROR_SUCCESS, + "returned %d with %u and 0x%x (expected ERROR_SUCCESS)\n", + res, GetLastError(), needed); + + + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_com1W, sizeof(portname_com1W), NULL, 0, &needed); + ok( res == ERROR_SUCCESS, + "returned %d with %u and 0x%x (expected ERROR_SUCCESS)\n", + res, GetLastError(), needed); + + + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_com2W, sizeof(portname_com2W), NULL, 0, &needed); + ok( res == ERROR_SUCCESS, + "returned %d with %u and 0x%x (expected ERROR_SUCCESS)\n", + res, GetLastError(), needed); + + + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_fileW, sizeof(portname_fileW), NULL, 0, &needed); + ok( res == ERROR_SUCCESS, + "returned %d with %u and 0x%x (expected ERROR_SUCCESS)\n", + res, GetLastError(), needed); + + + /* a normal, writeable file is allowed */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, &needed); + ok( res == ERROR_SUCCESS, + "returned %d with %u and 0x%x (expected ERROR_SUCCESS)\n", + res, GetLastError(), needed); + + pXcvClosePort(hXcv); + + + /* small check without access-rights: */ + hXcv = (HANDLE) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvOpenPort(emptyW, 0, &hXcv); + ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (!res) return; + + /* The ACCESS_MASK from XcvOpenPort is ignored in "PortIsValid" */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, &needed); + ok( res == ERROR_SUCCESS, "returned %d with %u (expected ERROR_SUCCESS)\n", res, GetLastError()); + + pXcvClosePort(hXcv); + +} + +/* ########################### */ + static void test_XcvOpenPort(void) { DWORD res; @@ -517,11 +682,19 @@ static void test_XcvOpenPort(void) START_TEST(localmon) { DWORD numentries; + DWORD res; /* This DLL does not exists on Win9x */ hdll = LoadLibraryA("localspl.dll"); if (!hdll) return; + tempdirW[0] = '\0'; + tempfileW[0] = '\0'; + res = GetTempPathW(MAX_PATH, tempdirW); + ok(res != 0, "with %u\n", GetLastError()); + res = GetTempFileNameW(tempdirW, wineW, 0, tempfileW); + ok(res != 0, "with %u\n", GetLastError()); + pInitializePrintMonitor = (void *) GetProcAddress(hdll, "InitializePrintMonitor"); pInitializePrintMonitorUI = (void *) GetProcAddress(hdll, "InitializePrintMonitorUI"); @@ -603,5 +776,6 @@ START_TEST(localmon) test_EnumPorts(); test_XcvClosePort(); test_XcvDataPort_MonitorUI(); + test_XcvDataPort_PortIsValid(); test_XcvOpenPort(); }

1 0