May 2006 - Wine-Commits - list.winehq.org

Juan Lang : crypt32: Combine redundant code.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: refs/heads/master Commit: dc660a81edae8a6e435c42a6e0bbdf03e9e20dbf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc660a81edae8a6e435c42a… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri May 26 09:41:37 2006 -0700 crypt32: Combine redundant code. --- dlls/crypt32/context.c | 10 +++ dlls/crypt32/crypt32_private.h | 4 + dlls/crypt32/store.c | 117 +++++++++++++--------------------------- 3 files changed, 53 insertions(+), 78 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index a88286b..558be9d 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -164,6 +164,16 @@ void Context_Release(void *context, size TRACE("%p's ref count is %ld\n", context, base->ref); } +void Context_CopyProperties(const void *to, const void *from, + size_t contextSize) +{ + PCONTEXT_PROPERTY_LIST toProperties, fromProperties; + + toProperties = Context_GetProperties((void *)to, contextSize); + fromProperties = Context_GetProperties((void *)from, contextSize); + ContextPropertyList_Copy(toProperties, fromProperties); +} + struct ContextList { PCWINE_CONTEXT_INTERFACE contextInterface; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 67306b3..f8365d6 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -125,6 +125,10 @@ void *Context_GetExtra(const void *conte /* Gets the context linked to by context, which must be a link context. */ void *Context_GetLinkedContext(void *context, size_t contextSize); +/* Copies properties from fromContext to toContext. */ +void Context_CopyProperties(const void *to, const void *from, + size_t contextSize); + struct _CONTEXT_PROPERTY_LIST; typedef struct _CONTEXT_PROPERTY_LIST *PCONTEXT_PROPERTY_LIST; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 6d3a1be..2ea714e 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -220,8 +220,7 @@ static BOOL CRYPT_MemAddCert(PWINECRYPT_ { context->hCertStore = store; if (ppStoreContext) - *ppStoreContext = - CertDuplicateCertificateContext(context); + *ppStoreContext = CertDuplicateCertificateContext(context); } return context ? TRUE : FALSE; } @@ -262,8 +261,7 @@ static BOOL CRYPT_MemAddCrl(PWINECRYPT_C { context->hCertStore = store; if (ppStoreContext) - *ppStoreContext = - CertDuplicateCRLContext(context); + *ppStoreContext = CertDuplicateCRLContext(context); } return context ? TRUE : FALSE; } @@ -597,7 +595,7 @@ static void *CRYPT_CollectionEnumCRL(PWI { PWINE_STORE_LIST_ENTRY storeEntry = *(PWINE_STORE_LIST_ENTRY *)Context_GetExtra(pPrev, - sizeof(CERT_CONTEXT)); + sizeof(CRL_CONTEXT)); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, offsetof(WINECRYPT_CERTSTORE, crls), pCRLInterface, pPrev, @@ -1227,14 +1225,11 @@ static void WINAPI CRYPT_RegCloseStore(H CryptMemFree(store); } -static BOOL WINAPI CRYPT_RegWriteCert(HCERTSTORE hCertStore, - PCCERT_CONTEXT cert, DWORD dwFlags) +static BOOL WINAPI CRYPT_RegWriteContext(PWINE_REGSTOREINFO store, + const void *context, DWORD dwFlags) { - PWINE_REGSTOREINFO store = (PWINE_REGSTOREINFO)hCertStore; BOOL ret; - TRACE("(%p, %p, %ld)\n", hCertStore, cert, dwFlags); - if (dwFlags & CERT_STORE_PROV_WRITE_ADD_FLAG) { store->dirty = TRUE; @@ -1245,14 +1240,12 @@ static BOOL WINAPI CRYPT_RegWriteCert(HC return ret; } -static BOOL WINAPI CRYPT_RegDeleteCert(HCERTSTORE hCertStore, - PCCERT_CONTEXT pCertContext, DWORD dwFlags) +static BOOL CRYPT_RegDeleteContext(PWINE_REGSTOREINFO store, + struct list *deleteList, const void *context, + PCWINE_CONTEXT_INTERFACE contextInterface) { - PWINE_REGSTOREINFO store = (PWINE_REGSTOREINFO)hCertStore; BOOL ret; - TRACE("(%p, %p, %08lx)\n", store, pCertContext, dwFlags); - if (store->dwOpenFlags & CERT_STORE_READONLY_FLAG) { SetLastError(ERROR_ACCESS_DENIED); @@ -1267,12 +1260,12 @@ static BOOL WINAPI CRYPT_RegDeleteCert(H { DWORD size = sizeof(toDelete->hash); - ret = CertGetCertificateContextProperty(pCertContext, - CERT_HASH_PROP_ID, toDelete->hash, &size); + ret = contextInterface->getProp(context, CERT_HASH_PROP_ID, + toDelete->hash, &size); if (ret) { EnterCriticalSection(&store->cs); - list_add_tail(&store->certsToDelete, &toDelete->entry); + list_add_tail(deleteList, &toDelete->entry); LeaveCriticalSection(&store->cs); } else @@ -1289,66 +1282,46 @@ static BOOL WINAPI CRYPT_RegDeleteCert(H return ret; } +static BOOL WINAPI CRYPT_RegWriteCert(HCERTSTORE hCertStore, + PCCERT_CONTEXT cert, DWORD dwFlags) +{ + PWINE_REGSTOREINFO store = (PWINE_REGSTOREINFO)hCertStore; + + TRACE("(%p, %p, %ld)\n", hCertStore, cert, dwFlags); + + return CRYPT_RegWriteContext(store, cert, dwFlags); +} + +static BOOL WINAPI CRYPT_RegDeleteCert(HCERTSTORE hCertStore, + PCCERT_CONTEXT pCertContext, DWORD dwFlags) +{ + PWINE_REGSTOREINFO store = (PWINE_REGSTOREINFO)hCertStore; + + TRACE("(%p, %p, %08lx)\n", store, pCertContext, dwFlags); + + return CRYPT_RegDeleteContext(store, &store->certsToDelete, pCertContext, + pCertInterface); +} + static BOOL WINAPI CRYPT_RegWriteCRL(HCERTSTORE hCertStore, PCCRL_CONTEXT crl, DWORD dwFlags) { PWINE_REGSTOREINFO store = (PWINE_REGSTOREINFO)hCertStore; - BOOL ret; TRACE("(%p, %p, %ld)\n", hCertStore, crl, dwFlags); - if (dwFlags & CERT_STORE_PROV_WRITE_ADD_FLAG) - { - store->dirty = TRUE; - ret = TRUE; - } - else - ret = FALSE; - return ret; + return CRYPT_RegWriteContext(store, crl, dwFlags); } static BOOL WINAPI CRYPT_RegDeleteCRL(HCERTSTORE hCertStore, PCCRL_CONTEXT pCrlContext, DWORD dwFlags) { PWINE_REGSTOREINFO store = (PWINE_REGSTOREINFO)hCertStore; - BOOL ret; TRACE("(%p, %p, %08lx)\n", store, pCrlContext, dwFlags); - if (store->dwOpenFlags & CERT_STORE_READONLY_FLAG) - { - SetLastError(ERROR_ACCESS_DENIED); - ret = FALSE; - } - else - { - PWINE_HASH_TO_DELETE toDelete = - CryptMemAlloc(sizeof(WINE_HASH_TO_DELETE)); - - if (toDelete) - { - DWORD size = sizeof(toDelete->hash); - - ret = CertGetCRLContextProperty(pCrlContext, CERT_HASH_PROP_ID, - toDelete->hash, &size); - if (ret) - { - EnterCriticalSection(&store->cs); - list_add_tail(&store->crlsToDelete, &toDelete->entry); - LeaveCriticalSection(&store->cs); - } - else - { - CryptMemFree(toDelete); - ret = FALSE; - } - } - else - ret = FALSE; - if (ret) - store->dirty = TRUE; - } - return ret; + return CRYPT_RegDeleteContext(store, &store->crlsToDelete, pCrlContext, + pCRLInterface); } static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags, @@ -1859,14 +1832,8 @@ DWORD CertStore_GetAccessState(HCERTSTOR return state; } -static void CertContext_CopyProperties(PCCERT_CONTEXT to, PCCERT_CONTEXT from) -{ - PCONTEXT_PROPERTY_LIST toProperties, fromProperties; - - toProperties = Context_GetProperties((void *)to, sizeof(CERT_CONTEXT)); - fromProperties = Context_GetProperties((void *)from, sizeof(CERT_CONTEXT)); - ContextPropertyList_Copy(toProperties, fromProperties); -} +#define CertContext_CopyProperties(to, from) \ + Context_CopyProperties((to), (from), sizeof(CERT_CONTEXT)) BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, @@ -1992,14 +1959,8 @@ BOOL WINAPI CertDeleteCertificateFromSto return ret; } -static void CrlContext_CopyProperties(PCCRL_CONTEXT to, PCCRL_CONTEXT from) -{ - PCONTEXT_PROPERTY_LIST toProperties, fromProperties; - - toProperties = Context_GetProperties((void *)to, sizeof(CRL_CONTEXT)); - fromProperties = Context_GetProperties((void *)from, sizeof(CRL_CONTEXT)); - ContextPropertyList_Copy(toProperties, fromProperties); -} +#define CrlContext_CopyProperties(to, from) \ + Context_CopyProperties((to), (from), sizeof(CRL_CONTEXT)) BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, PCCRL_CONTEXT pCrlContext, DWORD dwAddDisposition,

1 0

Huw Davies : gdi32: The font cache needs to discriminate whether the device can cope with bitmap fonts or not .
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: refs/heads/master Commit: 96ce83d08183068ee1a41bc257584e801560a978 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96ce83d08183068ee1a41bc… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 25 10:44:47 2006 +0100 gdi32: The font cache needs to discriminate whether the device can cope with bitmap fonts or not. --- dlls/gdi/freetype.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 8317eb1..3136244 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -234,6 +234,7 @@ typedef struct { DWORD hash; LOGFONTW lf; FMAT2 matrix; + BOOL can_use_bitmap; } FONT_DESC; typedef struct tagHFONTLIST { @@ -2124,6 +2125,7 @@ static BOOL fontcmp(GdiFont font, FONT_D if(font->font_desc.hash != fd->hash) return TRUE; if(memcmp(&font->font_desc.matrix, &fd->matrix, sizeof(fd->matrix))) return TRUE; if(memcmp(&font->font_desc.lf, &fd->lf, offsetof(LOGFONTW, lfFaceName))) return TRUE; + if(!font->font_desc.can_use_bitmap != !fd->can_use_bitmap) return TRUE; return strcmpiW(font->font_desc.lf.lfFaceName, fd->lf.lfFaceName); } @@ -2147,6 +2149,7 @@ static void calc_hash(FONT_DESC *pfd) hash ^= two_chars; if(!*pwc) break; } + hash ^= !pfd->can_use_bitmap; pfd->hash = hash; return; } @@ -2160,6 +2163,7 @@ static GdiFont find_in_cache(HFONT hfont memcpy(&fd.lf, plf, sizeof(LOGFONTW)); memcpy(&fd.matrix, pxf, sizeof(FMAT2)); + fd.can_use_bitmap = can_use_bitmap; calc_hash(&fd); /* try the in-use list */ @@ -2286,6 +2290,7 @@ GdiFont WineEngCreateFontInstance(DC *dc memcpy(&ret->font_desc.matrix, &dc->xformWorld2Vport, sizeof(FMAT2)); memcpy(&ret->font_desc.lf, &lf, sizeof(LOGFONTW)); + ret->font_desc.can_use_bitmap = can_use_bitmap; calc_hash(&ret->font_desc); hflist = HeapAlloc(GetProcessHeap(), 0, sizeof(*hflist)); hflist->hfont = hfont;

1 0

Robert Shearman : rpcrt4: Even though FC_DEREFERENCE conformance is handled elsewhere in
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: refs/heads/master Commit: 013d00f094dd8c1449fc26f0259c466c50fd9c6e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=013d00f094dd8c1449fc26f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 26 15:50:49 2006 +0100 rpcrt4: Even though FC_DEREFERENCE conformance is handled elsewhere in ComputeConformanceOrVariance it is still necessary to set the count variable to the value retrieved. --- dlls/rpcrt4/ndr_marshall.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 06ce04a..7516edd 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -489,12 +489,10 @@ PFORMAT_STRING ComputeConformanceOrVaria done_conf_grab: switch (pFormat[1]) { + case RPC_FC_DEREFERENCE: /* already handled */ case 0: /* no op */ *pCount = data; break; - case RPC_FC_DEREFERENCE: - /* already handled */ - break; case RPC_FC_ADD_1: *pCount = data + 1; break;

1 0

Robert Shearman : rpcrt4: Return the actual status code sent back by the server, rather than RPC_S_CALL_FAILED.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: refs/heads/master Commit: 8b56e88276c0adba9b89610bc8c439f797e6ea5b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b56e88276c0adba9b89610… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 26 15:52:09 2006 +0100 rpcrt4: Return the actual status code sent back by the server, rather than RPC_S_CALL_FAILED. --- dlls/rpcrt4/rpc_message.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 5409a6a..ffde890 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -754,8 +754,8 @@ RPC_STATUS WINAPI I_RpcReceive(PRPC_MESS break; case PKT_FAULT: pMsg->RpcFlags |= WINE_RPCFLAG_EXCEPTION; - ERR ("we got fault packet with status %lx\n", hdr->fault.status); - status = RPC_S_CALL_FAILED; /* ? */ + ERR ("we got fault packet with status 0x%lx\n", hdr->fault.status); + status = hdr->fault.status; /* FIXME: do translation from nca error codes */ goto fail; default: WARN("bad packet type %d\n", hdr->common.ptype);

1 0

Stefan Dösinger : wined3d: Fix IWineGDISurface:: SaveSnapshot.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: refs/heads/master Commit: 9d5849d9bdf419f5306a1c6c02bce0483ca26e44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d5849d9bdf419f5306a1c6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 26 12:32:52 2006 +0200 wined3d: Fix IWineGDISurface::SaveSnapshot. --- dlls/wined3d/surface_gdi.c | 124 ++++++++++++++++++++++++++++---------------- 1 files changed, 80 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index c4de656..3b25ff4 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1337,64 +1337,100 @@ IWineGDISurfaceImpl_LoadTexture(IWineD3D * WINED3D_OK on success * *****************************************************************************/ +static int get_shift(DWORD color_mask) { + int shift = 0; + while (color_mask > 0xFF) { + color_mask >>= 1; + shift += 1; + } + while ((color_mask & 0x80) == 0) { + color_mask <<= 1; + shift -= 1; + } + return shift; +} + + HRESULT WINAPI IWineGDISurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const char* filename) { FILE* f = NULL; - UINT i = 0, y = 0; + UINT y = 0, x = 0; IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - BYTE *textureRow; - DWORD color; + static char *output = NULL; + static int size = 0; + + if (This->pow2Width > size) { + output = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->pow2Width * 3); + size = This->pow2Width; + } + f = fopen(filename, "w+"); - if (NULL == f) - { + if (NULL == f) { ERR("opening of %s failed with\n", filename); return WINED3DERR_INVALIDCALL; } - /* Save the dat out to a TGA file because - * 1: it's an easy raw format, - * 2: it supports an alpha chanel - */ - TRACE("(%p) opened %s with format %s\n", This, filename, debug_d3dformat(This->resource.format)); - /* TGA header */ - fputc(0,f); - fputc(0,f); - fputc(2,f); - fputc(0,f); - fputc(0,f); - fputc(0,f); - fputc(0,f); - fputc(0,f); - fputc(0,f); - fputc(0,f); - fputc(0,f); - fputc(0,f); - /* short width*/ - fwrite(&This->currentDesc.Width,2,1,f); - /* short height */ - fwrite(&This->currentDesc.Height,2,1,f); - /* format rgba */ - fputc(0x20,f); - fputc(0x28,f); - /* raw data */ - /* if the data is upside down if we've fetched it from a back buffer, - * so it needs flipping again to make it the correct way u - */ + fprintf(f, "P6\n%d %d\n255\n", This->pow2Width, This->pow2Height); - textureRow = This->resource.allocatedMemory; - for (y = 0 ; y < This->currentDesc.Height; y++) { - for (i = 0; i < This->currentDesc.Width; i++) { - color = *((DWORD*)textureRow); - fputc((color >> 16) & 0xFF, f); /* B */ - fputc((color >> 8) & 0xFF, f); /* G */ - fputc((color >> 0) & 0xFF, f); /* R */ - fputc((color >> 24) & 0xFF, f); /* A */ - textureRow += 4; + if (This->resource.format == WINED3DFMT_P8) { + unsigned char table[256][3]; + int i; + + if (This->palette == NULL) { + fclose(f); + return WINED3DERR_INVALIDCALL; + } + for (i = 0; i < 256; i++) { + table[i][0] = This->palette->palents[i].peRed; + table[i][1] = This->palette->palents[i].peGreen; + table[i][2] = This->palette->palents[i].peBlue; + } + for (y = 0; y < This->pow2Height; y++) { + unsigned char *src = (unsigned char *) This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface)); + for (x = 0; x < This->pow2Width; x++) { + unsigned char color = *src; + src += 1; + + output[3 * x + 0] = table[color][0]; + output[3 * x + 1] = table[color][1]; + output[3 * x + 2] = table[color][2]; + } + fwrite(output, 3 * This->pow2Width, 1, f); + } + } else { + int red_shift, green_shift, blue_shift, pix_width; + + pix_width = This->bytesPerPixel; + + red_shift = get_shift(get_bitmask_red(This->resource.format)); + green_shift = get_shift(get_bitmask_green(This->resource.format)); + blue_shift = get_shift(get_bitmask_blue(This->resource.format)); + + for (y = 0; y < This->pow2Height; y++) { + unsigned char *src = (unsigned char *) This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface)); + for (x = 0; x < This->pow2Width; x++) { + unsigned int color; + unsigned int comp; + int i; + + color = 0; + for (i = 0; i < pix_width; i++) { + color |= src[i] << (8 * i); + } + src += 1 * pix_width; + + comp = color & get_bitmask_red(This->resource.format); + output[3 * x + 0] = red_shift > 0 ? comp >> red_shift : comp << -red_shift; + comp = color & get_bitmask_green(This->resource.format); + output[3 * x + 1] = green_shift > 0 ? comp >> green_shift : comp << -green_shift; + comp = color & get_bitmask_blue(This->resource.format); + output[3 * x + 2] = blue_shift > 0 ? comp >> blue_shift : comp << -blue_shift; + } + fwrite(output, 3 * This->pow2Width, 1, f); } } - TRACE("Closing file\n"); fclose(f); return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Disable the depth test in UnlockRect
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: refs/heads/master Commit: 0ce3cb23797de0446c05a710adbfbed07898db27 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ce3cb23797de0446c05a71… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 26 12:17:21 2006 +0200 wined3d: Disable the depth test in UnlockRect --- 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 1eebb66..c21e715 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -746,6 +746,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Unloc if (iface == implSwapChain->backBuffer || iface == implSwapChain->frontBuffer || iface == myDevice->renderTarget) { GLint prev_store; GLint prev_draw; + GLint prev_depth_test; GLint prev_rasterpos[4]; /* Some drivers(radeon dri, others?) don't like exceptions during @@ -776,6 +777,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Unloc vcheckGLcall("glIntegerv"); glPixelZoom(1.0, -1.0); vcheckGLcall("glPixelZoom"); + prev_depth_test = glIsEnabled(GL_DEPTH_TEST); /* glDrawPixels transforms the raster position as though it was a vertex - we want to draw at screen position 0,0 - Set up ortho (rhw) mode as @@ -796,6 +798,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Unloc /* And back buffers are not blended */ glDisable(GL_BLEND); + glDisable(GL_DEPTH_TEST); glRasterPos3i(This->lockedRect.left, This->lockedRect.top, 1); vcheckGLcall("glRasterPos2f"); @@ -897,6 +900,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Unloc vcheckGLcall("glDrawBuffer"); glRasterPos3iv(&prev_rasterpos[0]); vcheckGLcall("glRasterPos3iv"); + if(prev_depth_test) glEnable(GL_DEPTH_TEST); /* Reset to previous pack row length / blending state */ glPixelStorei(GL_UNPACK_ROW_LENGTH, skipBytes);

1 0

Jason Green : wined3d: Fix regression introduced by recent multitexture patch.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: refs/heads/master Commit: c60f296b70c704b4bdec7e792151127782d4dad9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c60f296b70c704b4bdec7e7… Author: Jason Green <jave27(a)gmail.com> Date: Fri May 26 09:22:14 2006 -0400 wined3d: Fix regression introduced by recent multitexture patch. --- dlls/wined3d/drawprim.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 9f5994a..003eac9 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1193,7 +1193,7 @@ #endif } /* Select the correct texture stage */ - GL_EXTCALL(glClientActiveTextureARB(textureNo)); + GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + textureNo)); if (This->stateBlock->textures[textureNo] != NULL) { int coordIdx = This->stateBlock->textureState[textureNo][D3DTSS_TEXCOORDINDEX]; TRACE("Setting up texture %u, cordindx %u, data %p\n", textureNo, coordIdx, sd->u.s.texCoords[coordIdx].lpData); @@ -1201,12 +1201,12 @@ #endif if (coordIdx >= MAX_TEXTURES) { VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); glDisableClientState(GL_TEXTURE_COORD_ARRAY); - GL_EXTCALL(glMultiTexCoord4fARB(textureNo, 0, 0, 0, 1)); + GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); } else if (sd->u.s.texCoords[coordIdx].lpData == NULL) { VTRACE(("Bound texture but no texture coordinates supplied, so skipping\n")); glDisableClientState(GL_TEXTURE_COORD_ARRAY); - GL_EXTCALL(glMultiTexCoord4fARB(textureNo, 0, 0, 0, 1)); + GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); } else { @@ -1217,7 +1217,7 @@ #endif } else { glDisableClientState(GL_TEXTURE_COORD_ARRAY); - GL_EXTCALL(glMultiTexCoord4fARB(textureNo, 0, 0, 0, 1)); + GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); } } }

1 0

Alexandre Julliard : comctl32: Dialog procedures should be called with CallWindowProc.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: refs/heads/master Commit: ac30d46b69b05feb42aeec83e741388fd8719d88 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac30d46b69b05feb42aeec8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 16:34:09 2006 +0200 comctl32: Dialog procedures should be called with CallWindowProc. --- dlls/comctl32/theme_dialog.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/theme_dialog.c b/dlls/comctl32/theme_dialog.c index d9a0a05..cfcb56f 100644 --- a/dlls/comctl32/theme_dialog.c +++ b/dlls/comctl32/theme_dialog.c @@ -74,8 +74,8 @@ LRESULT CALLBACK THEMING_DialogSubclassP if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); { RECT rc; - DLGPROC dlgp = (DLGPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); - if (!dlgp (hWnd, msg, wParam, lParam)) + WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); + if (!CallWindowProcW(dlgp, hWnd, msg, wParam, lParam)) { /* Draw background*/ GetClientRect (hWnd, &rc); @@ -104,8 +104,8 @@ #endif case WM_CTLCOLORSTATIC: if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); { - DLGPROC dlgp = (DLGPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); - LRESULT result = (LRESULT)dlgp (hWnd, msg, wParam, lParam); + WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); + LRESULT result = CallWindowProcW(dlgp, hWnd, msg, wParam, lParam); if (!result) { /* Override defaults with more suitable values when themed */

1 0

Alexandre Julliard : user: Only include winproc.h where necessary.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: refs/heads/master Commit: 14fb1ddcc5d8959a6e3c1595a5f9265bb20f5b7d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=14fb1ddcc5d8959a6e3c159… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 14:54:54 2006 +0200 user: Only include winproc.h where necessary. --- dlls/user/controls.h | 8 +++++++- dlls/user/user16.c | 2 +- dlls/user/win.c | 1 + dlls/user/winproc.h | 7 ------- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/user/controls.h b/dlls/user/controls.h index eef1776..98dfa4d 100644 --- a/dlls/user/controls.h +++ b/dlls/user/controls.h @@ -22,7 +22,7 @@ #ifndef __WINE_CONTROLS_H #define __WINE_CONTROLS_H #include "winuser.h" -#include "winproc.h" +#include "wine/winbase16.h" /* Built-in class names (see _Undocumented_Windows_ p.418) */ #define POPUPMENU_CLASS_ATOMA MAKEINTATOMA(32768) /* PopupMenu */ @@ -45,6 +45,12 @@ struct builtin_class_descr HBRUSH brush; /* brush or system color */ }; +/* Class functions */ +struct tagCLASS; /* opaque structure */ +struct tagWND; +extern void CLASS_RegisterBuiltinClasses(void); +extern void CLASS_AddWindow( struct tagCLASS *class, struct tagWND *win, BOOL unicode ); +extern void CLASS_FreeModuleClasses( HMODULE16 hModule ); /* defwnd proc */ extern HBRUSH DEFWND_ControlColor( HDC hDC, UINT ctlType ); diff --git a/dlls/user/user16.c b/dlls/user/user16.c index 3ffde37..37535ee 100644 --- a/dlls/user/user16.c +++ b/dlls/user/user16.c @@ -30,7 +30,7 @@ #include "winbase.h" #include "wownt32.h" #include "user_private.h" #include "win.h" -#include "winproc.h" +#include "controls.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(user); diff --git a/dlls/user/win.c b/dlls/user/win.c index 4c1845d..080835c 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -33,6 +33,7 @@ #include "wownt32.h" #include "wine/server.h" #include "wine/unicode.h" #include "win.h" +#include "winproc.h" #include "user_private.h" #include "controls.h" #include "winpos.h" diff --git a/dlls/user/winproc.h b/dlls/user/winproc.h index 4821140..69b6d76 100644 --- a/dlls/user/winproc.h +++ b/dlls/user/winproc.h @@ -49,11 +49,4 @@ extern INT_PTR WINPROC_CallDlgProc16( DL extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); -/* Class functions */ -struct tagCLASS; /* opaque structure */ -struct tagWND; -extern void CLASS_RegisterBuiltinClasses(void); -extern void CLASS_AddWindow( struct tagCLASS *class, struct tagWND *win, BOOL unicode ); -extern void CLASS_FreeModuleClasses( HMODULE16 hModule ); - #endif /* __WINE_WINPROC_H */

1 0

Alexandre Julliard : user: Added fast 32-> 16 mapping for the remaining messages.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: refs/heads/master Commit: 7b83af4b0e0a3cd772c4e0e175062f3dc010f445 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b83af4b0e0a3cd772c4e0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 14:28:22 2006 +0200 user: Added fast 32->16 mapping for the remaining messages. --- dlls/user/winproc.c | 166 ++++++++++++++++++++++----------------------------- 1 files changed, 73 insertions(+), 93 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 2c87978..b993597 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -748,90 +748,6 @@ static HANDLE16 convert_handle_32_to_16( /********************************************************************** - * WINPROC_MapMsg32ATo16 - * - * Map a message from 32-bit Ansi to 16-bit. - * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed. - */ -static INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32, WPARAM wParam32, - UINT16 *pmsg16, WPARAM16 *pwparam16, LPARAM *plparam ) -{ - *pmsg16 = (UINT16)msg32; - *pwparam16 = (WPARAM16)LOWORD(wParam32); - switch(msg32) - { - case WM_ACTIVATE: - case WM_CHARTOITEM: - case WM_COMMAND: - case WM_VKEYTOITEM: - *plparam = MAKELPARAM( (HWND16)*plparam, HIWORD(wParam32) ); - return 0; - case WM_HSCROLL: - case WM_VSCROLL: - *plparam = MAKELPARAM( HIWORD(wParam32), (HWND16)*plparam ); - return 0; - case WM_CTLCOLORMSGBOX: - case WM_CTLCOLOREDIT: - case WM_CTLCOLORLISTBOX: - case WM_CTLCOLORBTN: - case WM_CTLCOLORDLG: - case WM_CTLCOLORSCROLLBAR: - case WM_CTLCOLORSTATIC: - *pmsg16 = WM_CTLCOLOR; - *plparam = MAKELPARAM( (HWND16)*plparam, - (WORD)msg32 - WM_CTLCOLORMSGBOX ); - return 0; - case WM_MENUSELECT: - if(HIWORD(wParam32) & MF_POPUP) - { - HMENU hmenu; - if (((UINT)HIWORD(wParam32) != 0xFFFF) || (*plparam)) - { - if((hmenu = GetSubMenu((HMENU)*plparam, *pwparam16))) - *pwparam16=HMENU_16(hmenu); - } - } - /* fall through */ - case WM_MENUCHAR: - *plparam = MAKELPARAM( HIWORD(wParam32), (HMENU16)*plparam ); - return 0; - case WM_PARENTNOTIFY: - if ((LOWORD(wParam32)==WM_CREATE) || (LOWORD(wParam32)==WM_DESTROY)) - *plparam = MAKELPARAM( (HWND16)*plparam, HIWORD(wParam32)); - /* else nothing to do */ - return 0; - case WM_ACTIVATEAPP: - if (*plparam) *plparam = HTASK_16( (HANDLE)*plparam ); - return 0; - case WM_PAINT: - if (IsIconic( hwnd ) && GetClassLongPtrW( hwnd, GCLP_HICON )) - { - *pmsg16 = WM_PAINTICON; - *pwparam16 = 1; - } - return 0; - case WM_ERASEBKGND: - if (IsIconic( hwnd ) && GetClassLongPtrW( hwnd, GCLP_HICON )) - *pmsg16 = WM_ICONERASEBKGND; - return 0; - case WM_PAINTCLIPBOARD: - case WM_SIZECLIPBOARD: - FIXME_(msg)("message %04x needs translation\n", msg32 ); - return -1; - /* following messages should not be sent to 16-bit apps */ - case WM_SIZING: - case WM_MOVING: - case WM_CAPTURECHANGED: - case WM_STYLECHANGING: - case WM_STYLECHANGED: - return -1; - default: /* No translation needed */ - return 0; - } -} - - -/********************************************************************** * WINPROC_CallProcAtoW * * Call a window procedure, translating args from Ansi to Unicode. @@ -1941,6 +1857,67 @@ LRESULT WINPROC_CallProc32ATo16( winproc ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); UnMapLS( lParam ); break; + case WM_ACTIVATE: + case WM_CHARTOITEM: + case WM_COMMAND: + case WM_VKEYTOITEM: + ret = callback( HWND_16(hwnd), msg, wParam, MAKELPARAM( (HWND16)lParam, HIWORD(wParam) ), + result, arg ); + break; + case WM_HSCROLL: + case WM_VSCROLL: + ret = callback( HWND_16(hwnd), msg, wParam, MAKELPARAM( HIWORD(wParam), (HWND16)lParam ), + result, arg ); + break; + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: + ret = callback( HWND_16(hwnd), WM_CTLCOLOR, wParam, + MAKELPARAM( (HWND16)lParam, msg - WM_CTLCOLORMSGBOX ), result, arg ); + break; + case WM_MENUSELECT: + if(HIWORD(wParam) & MF_POPUP) + { + HMENU hmenu; + if ((HIWORD(wParam) != 0xffff) || lParam) + { + if ((hmenu = GetSubMenu( (HMENU)lParam, LOWORD(wParam) ))) + { + ret = callback( HWND_16(hwnd), msg, HMENU_16(hmenu), + MAKELPARAM( HIWORD(wParam), (HMENU16)lParam ), result, arg ); + break; + } + } + } + /* fall through */ + case WM_MENUCHAR: + ret = callback( HWND_16(hwnd), msg, wParam, + MAKELPARAM( HIWORD(wParam), (HMENU16)lParam ), result, arg ); + break; + case WM_PARENTNOTIFY: + if ((LOWORD(wParam) == WM_CREATE) || (LOWORD(wParam) == WM_DESTROY)) + ret = callback( HWND_16(hwnd), msg, wParam, + MAKELPARAM( (HWND16)lParam, HIWORD(wParam) ), result, arg ); + else + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + break; + case WM_ACTIVATEAPP: + ret = callback( HWND_16(hwnd), msg, wParam, HTASK_16( (HANDLE)lParam ), result, arg ); + break; + case WM_PAINT: + if (IsIconic( hwnd ) && GetClassLongPtrW( hwnd, GCLP_HICON )) + ret = callback( HWND_16(hwnd), WM_PAINTICON, 1, lParam, result, arg ); + else + ret = callback( HWND_16(hwnd), WM_PAINT, wParam, lParam, result, arg ); + break; + case WM_ERASEBKGND: + if (IsIconic( hwnd ) && GetClassLongPtrW( hwnd, GCLP_HICON )) msg = WM_ICONERASEBKGND; + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + break; case WM_DDE_INITIATE: case WM_DDE_TERMINATE: case WM_DDE_UNADVISE: @@ -2164,16 +2141,19 @@ LRESULT WINPROC_CallProc32ATo16( winproc RECT16to32( &rect, r32 ); } break; + case WM_PAINTCLIPBOARD: + case WM_SIZECLIPBOARD: + FIXME_(msg)( "message %04x needs translation\n", msg ); + break; + /* the following messages should not be sent to 16-bit apps */ + case WM_SIZING: + case WM_MOVING: + case WM_CAPTURECHANGED: + case WM_STYLECHANGING: + case WM_STYLECHANGED: + break; default: - { - UINT16 msg16; - WPARAM16 wParam16; - LPARAM lParam16 = lParam; - if (WINPROC_MapMsg32ATo16( hwnd, msg, wParam, &msg16, &wParam16, &lParam16 ) != -1) - { - ret = callback( HWND_16(hwnd), msg16, wParam16, lParam16, result, arg ); - } - } + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); break; } return ret;

1 0