September 2007 - Wine-Commits

Andrew Talbot : comdlg32: Fix some memory leaks.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: 1ca7435754793af982a880cd354752222a180fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca7435754793af982a880cd3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 14 00:16:11 2007 +0100 comdlg32: Fix some memory leaks. --- dlls/comdlg32/printdlg.c | 14 ++++++++++++-- dlls/comdlg32/printdlg16.c | 9 +++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index f3736ce..8e334c3 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2059,7 +2059,10 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed); dbuf = HeapAlloc(GetProcessHeap(),0,needed); if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { - ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",GetLastError(),pbuf->pPrinterName); + ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n", + GetLastError(),pbuf->pPrinterName); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); return FALSE; } @@ -2206,7 +2209,10 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd) GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed); dbuf = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*needed); if (!GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { - ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",GetLastError(),debugstr_w(pbuf->pPrinterName)); + ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n", + GetLastError(),debugstr_w(pbuf->pPrinterName)); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); return FALSE; } @@ -2615,6 +2621,8 @@ PRINTDLG_PS_ChangeActivePrinterA(LPSTR name, PageSetupDataA *pda){ lpDriverInfo = HeapAlloc(GetProcessHeap(), 0, needed); if(!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)lpDriverInfo, needed, &needed)) { ERR("GetPrinterDriverA failed for %s, fix your config!\n", lpPrinterInfo->pPrinterName); + HeapFree(GetProcessHeap(), 0, lpDriverInfo); + HeapFree(GetProcessHeap(), 0, lpPrinterInfo); return FALSE; } ClosePrinter(hprn); @@ -2622,6 +2630,8 @@ PRINTDLG_PS_ChangeActivePrinterA(LPSTR name, PageSetupDataA *pda){ needed = DocumentPropertiesA(0, 0, name, NULL, NULL, 0); if(needed == -1) { ERR("DocumentProperties fails on %s\n", debugstr_a(name)); + HeapFree(GetProcessHeap(), 0, lpDriverInfo); + HeapFree(GetProcessHeap(), 0, lpPrinterInfo); return FALSE; } pDevMode = HeapAlloc(GetProcessHeap(), 0, needed); diff --git a/dlls/comdlg32/printdlg16.c b/dlls/comdlg32/printdlg16.c index 6aa8c6c..65921f6 100644 --- a/dlls/comdlg32/printdlg16.c +++ b/dlls/comdlg32/printdlg16.c @@ -390,9 +390,10 @@ BOOL16 WINAPI PrintDlg16( GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed); dbuf = HeapAlloc(GetProcessHeap(),0,needed); if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { - ERR("GetPrinterDriverA failed for %s, le %d, fix your config!\n", - pbuf->pPrinterName,GetLastError()); - HeapFree(GetProcessHeap(), 0, dbuf); + ERR("GetPrinterDriverA failed for %s, le %d, fix your config!\n", + pbuf->pPrinterName,GetLastError()); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); return FALSE; } @@ -506,7 +507,7 @@ BOOL16 WINAPI PrintDlg16( HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode); HeapFree(GetProcessHeap(), 0, PrintStructures->lpPrinterInfo); HeapFree(GetProcessHeap(), 0, PrintStructures->lpDriverInfo); - HeapFree(GetProcessHeap(), 0, PrintStructures); + HeapFree(GetProcessHeap(), 0, ptr16); } if(bRet && (lppd->Flags & PD_RETURNDC || lppd->Flags & PD_RETURNIC)) bRet = PRINTDLG_CreateDC16(lppd);

1 0

Dan Hipschman : widl: Add padding to the end of complex structures.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: 5e84eb9a475a10410b6ad56c029ef1023fa44d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e84eb9a475a10410b6ad56c0… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Sep 13 18:04:32 2007 -0700 widl: Add padding to the end of complex structures. --- dlls/rpcrt4/tests/server.c | 11 +++++++++++ dlls/rpcrt4/tests/server.idl | 8 ++++++++ tools/widl/parser.y | 3 +++ tools/widl/typegen.c | 36 ++++++++++++++++++++++++++++++++++++ tools/widl/typegen.h | 1 + 5 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index cd21468..879e0d1 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -344,6 +344,12 @@ s_sum_aligns(aligns_t *a) return a->c + a->i + a->s + a->d; } +int +s_sum_padded(padded_t *p) +{ + return p->i + p->c; +} + void s_stop(void) { @@ -392,6 +398,7 @@ basic_tests(void) static aligns_t aligns = {3, 4, 5, 6.0}; pints_t pints; ptypes_t ptypes; + padded_t padded; int i1, i2, i3, *pi2, *pi3, **ppi3; double u, v; float s, t; @@ -465,6 +472,10 @@ basic_tests(void) ok(enum_ord(E4) == 4, "RPC enum_ord\n"); ok(sum_aligns(&aligns) == 18.0, "RPC sum_aligns\n"); + + padded.i = -3; + padded.c = 8; + ok(sum_padded(&padded) == 5, "RPC sum_padded\n"); } static void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 3ee40ae..d84637c 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -200,5 +200,13 @@ interface IServer double sum_aligns(aligns_t *a); + typedef struct + { + int i; + char c; + } padded_t; + + int sum_padded(padded_t *p); + void stop(void); } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5b4c5ff..5d99c5a 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1679,6 +1679,9 @@ static int get_struct_type(var_list_t *fields) int has_variance = 0; var_t *field; + if (get_padding(fields)) + return RPC_FC_BOGUS_STRUCT; + if (fields) LIST_FOR_EACH_ENTRY( field, fields, var_t, entry ) { type_t *t = field->type; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f0c298b..02b2cbc 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -726,6 +726,29 @@ static size_t union_memsize(const var_list_t *fields, unsigned int *pmaxa) return maxs; } +int get_padding(const var_list_t *fields) +{ + unsigned short offset = 0; + int salign = -1; + const var_t *f; + + if (!fields) + return 0; + + LIST_FOR_EACH_ENTRY(f, fields, const var_t, entry) + { + type_t *ft = f->type; + unsigned int align = 0; + size_t size = type_memsize(ft, &align); + if (salign == -1) + salign = align; + offset = (offset + (align - 1)) & ~(align - 1); + offset += size; + } + + return ((offset + (salign - 1)) & ~(salign - 1)) - offset; +} + size_t type_memsize(const type_t *t, unsigned int *align) { size_t size = 0; @@ -1518,6 +1541,8 @@ static void write_struct_members(FILE *file, const type_t *type, { const var_t *field; unsigned short offset = 0; + int salign = -1; + int padding; if (type->fields) LIST_FOR_EACH_ENTRY( field, type->fields, const var_t, entry ) { @@ -1526,6 +1551,8 @@ static void write_struct_members(FILE *file, const type_t *type, { unsigned int align = 0; size_t size = type_memsize(ft, &align); + if (salign == -1) + salign = align; if ((align - 1) & offset) { unsigned char fc = 0; @@ -1549,6 +1576,15 @@ static void write_struct_members(FILE *file, const type_t *type, } } + padding = ((offset + (salign - 1)) & ~(salign - 1)) - offset; + if (padding) + { + print_file(file, 2, "0x%x,\t/* FC_STRUCTPAD%d */\n", + RPC_FC_STRUCTPAD1 + padding - 1, + padding); + *typestring_offset += 1; + } + write_end(file, typestring_offset); } diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index eefecd7..448e503 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -55,3 +55,4 @@ size_t type_memsize(const type_t *t, unsigned int *align); int decl_indirect(const type_t *t); void write_parameters_init(FILE *file, int indent, const func_t *func); void print(FILE *file, int indent, const char *format, va_list ap); +int get_padding(const var_list_t *fields);

1 0

Andrew Talbot : comctl32: Fix a memory leak.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: 4ccd78c2a1f2531b0cd42960821f6472cbe487c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccd78c2a1f2531b0cd429608… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 14 00:15:55 2007 +0100 comctl32: Fix a memory leak. --- dlls/comctl32/treeview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 7699f65..29d5662 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3803,6 +3803,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) if (ptr == NULL) { ERR("OutOfMemory, cannot allocate space for label\n"); + if(newText != tmpText) Free(newText); DestroyWindow(infoPtr->hwndEdit); infoPtr->hwndEdit = 0; return FALSE;

1 0

Stefan Dösinger : wined3d: The D3DSI_COISSUE flag changes the behavior of cnd.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: 02114ac21f08b7a8bb60ccc71282ecf76a707a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02114ac21f08b7a8bb60ccc71… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Sep 13 14:48:57 2007 +0200 wined3d: The D3DSI_COISSUE flag changes the behavior of cnd. --- dlls/d3d9/tests/visual.c | 162 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/arb_program_shader.c | 11 ++- dlls/wined3d/baseshader.c | 4 + dlls/wined3d/glsl_shader.c | 10 ++- 4 files changed, 181 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02114ac21f08b7a8bb60c…

1 0

Stefan Dösinger : wined3d: Add a test for the cnd instruction.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: c96236ff3ebeffd8dccaa9206acc1a6fd0752091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c96236ff3ebeffd8dccaa9206… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Sep 13 12:16:09 2007 +0200 wined3d: Add a test for the cnd instruction. --- dlls/d3d9/tests/visual.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 175 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c96236ff3ebeffd8dccaa…

1 0

Stefan Dösinger : wined3d: Fix texdp3tex in glsl.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: 8273cfdf019179970d34b279f10726c517f538f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8273cfdf019179970d34b279f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Sep 13 12:25:29 2007 +0200 wined3d: Fix texdp3tex in glsl. --- dlls/wined3d/glsl_shader.c | 28 ++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1b79f4d..f36884c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1762,15 +1762,39 @@ void pshader_glsl_texcoord(SHADER_OPCODE_ARG* arg) { void pshader_glsl_texdp3tex(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src0_param; char dst_mask[6]; + glsl_sample_function_t sample_function; DWORD sampler_idx = arg->dst & WINED3DSP_REGNUM_MASK; DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; + DWORD sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_mask, &src0_param); shader_glsl_append_dst(arg->buffer, arg); shader_glsl_get_write_mask(arg->dst, dst_mask); - shader_addline(arg->buffer, "texture2D(Psampler%u, vec2(dot(gl_TexCoord[%u].xyz, %s), 0.5))%s);\n", - sampler_idx, sampler_idx, src0_param.param_str, dst_mask); + + /* Do I have to take care about the projected bit? I don't think so, since the dp3 returns only one + * scalar, and projected sampling would require 4 + */ + shader_glsl_get_sample_function(sampler_type, FALSE, &sample_function); + + switch(count_bits(sample_function.coord_mask)) { + case 1: + shader_addline(arg->buffer, "%s(Psampler%u, dot(gl_TexCoord[%u].xyz, %s))%s);\n", + sample_function.name, sampler_idx, sampler_idx, src0_param.param_str, dst_mask); + break; + + case 2: + shader_addline(arg->buffer, "%s(Psampler%u, vec2(dot(gl_TexCoord[%u].xyz, %s), 0.0))%s);\n", + sample_function.name, sampler_idx, sampler_idx, src0_param.param_str, dst_mask); + break; + + case 3: + shader_addline(arg->buffer, "%s(Psampler%u, vec3(dot(gl_TexCoord[%u].xyz, %s), 0.0, 0.0))%s);\n", + sample_function.name, sampler_idx, sampler_idx, src0_param.param_str, dst_mask); + break; + default: + FIXME("Unexpected mask bitcount %d\n", count_bits(sample_function.coord_mask)); + } } /** Process the WINED3DSIO_TEXDP3 instruction in GLSL: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b6f4bee..86b11de 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1554,6 +1554,7 @@ BOOL getDepthStencilBits(WINED3DFORMAT fmt, short *depthSize, short *stencilSize /* Math utils */ void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2); +unsigned int count_bits(unsigned int mask); /***************************************************************************** * To enable calling of inherited functions, requires prototypes

1 0

Stefan Dösinger : wined3d: Add support for showing a logo.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: 271fb0052f361e9c8c964196609a5feb11209223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=271fb0052f361e9c8c9641966… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Sep 1 21:22:32 2007 +0200 wined3d: Add support for showing a logo. --- dlls/wined3d/device.c | 63 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/swapchain.c | 4 ++ dlls/wined3d/wined3d_main.c | 8 ++++- dlls/wined3d/wined3d_private.h | 4 ++ 4 files changed, 78 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 402b08a..729acf7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1871,6 +1871,63 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DW return WINED3D_OK; } +static void IWineD3DDeviceImpl_LoadLogo(IWineD3DDeviceImpl *This, const char *filename) { + HBITMAP hbm; + BITMAP bm; + HRESULT hr; + HDC dcb = NULL, dcs = NULL; + WINEDDCOLORKEY colorkey; + + hbm = (HBITMAP) LoadImageA(NULL, filename, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE | LR_CREATEDIBSECTION); + if(hbm) + { + GetObjectA(hbm, sizeof(BITMAP), &bm); + dcb = CreateCompatibleDC(NULL); + if(!dcb) goto out; + SelectObject(dcb, hbm); + } + else + { + /* Create a 32x32 white surface to indicate that wined3d is used, but the specified image + * couldn't be loaded + */ + memset(&bm, 0, sizeof(bm)); + bm.bmWidth = 32; + bm.bmHeight = 32; + } + + hr = IWineD3DDevice_CreateSurface((IWineD3DDevice *) This, bm.bmWidth, bm.bmHeight, WINED3DFMT_R5G6B5, + TRUE, FALSE, 0, &This->logo_surface, WINED3DRTYPE_SURFACE, 0, + WINED3DPOOL_DEFAULT, WINED3DMULTISAMPLE_NONE, 0, NULL, SURFACE_OPENGL, NULL); + if(FAILED(hr)) { + ERR("Wine logo requested, but failed to create surface\n"); + goto out; + } + + if(dcb) { + hr = IWineD3DSurface_GetDC(This->logo_surface, &dcs); + if(FAILED(hr)) goto out; + BitBlt(dcs, 0, 0, bm.bmWidth, bm.bmHeight, dcb, 0, 0, SRCCOPY); + IWineD3DSurface_ReleaseDC(This->logo_surface, dcs); + + colorkey.dwColorSpaceLowValue = 0; + colorkey.dwColorSpaceHighValue = 0; + IWineD3DSurface_SetColorKey(This->logo_surface, WINEDDCKEY_SRCBLT, &colorkey); + } else { + /* Fill the surface with a white color to show that wined3d is there */ + IWineD3DDevice_ColorFill((IWineD3DDevice *) This, This->logo_surface, NULL, 0xffffffff); + } + + out: + if(dcb) { + DeleteDC(dcb); + } + if(hbm) { + DeleteObject(hbm); + } + return; +} + static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSwapChainImpl *swapchain; @@ -2007,6 +2064,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR 0x00, 1.0, 0); This->d3d_initialized = TRUE; + + if(wined3d_settings.logo) { + IWineD3DDeviceImpl_LoadLogo(This, wined3d_settings.logo); + } return WINED3D_OK; } @@ -2023,6 +2084,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D */ ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if(This->logo_surface) IWineD3DSurface_Release(This->logo_surface); + TRACE("Deleting high order patches\n"); for(i = 0; i < PATCHMAP_SIZE; i++) { struct list *e1, *e2; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f5ab22d..4ecab95 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -175,6 +175,10 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO } IWineD3DSurface_Blt(This->backBuffer[0], &destRect, (IWineD3DSurface *) &cursor, NULL, WINEDDBLT_KEYSRC, NULL, WINED3DTEXF_NONE); } + if(This->wineD3DDevice->logo_surface) { + /* Blit the logo into the upper left corner of the drawable */ + IWineD3DSurface_BltFast(This->backBuffer[0], 0, 0, This->wineD3DDevice->logo_surface, NULL, WINEDDBLTFAST_SRCCOLORKEY); + } if (pSourceRect || pDestRect) FIXME("Unhandled present options %p/%p\n", pSourceRect, pDestRect); /* TODO: If only source rect or dest rect are supplied then clip the window to match */ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 13ab258..92bfe75 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -42,7 +42,8 @@ wined3d_settings_t wined3d_settings = FALSE, /* Use of GLSL disabled by default */ ORM_BACKBUFFER, /* Use the backbuffer to do offscreen rendering */ RTL_AUTO, /* Automatically determine best locking method */ - 64*1024*1024 /* 64MB texture memory by default */ + 64*1024*1024, /* 64MB texture memory by default */ + NULL /* No wine logo by default */ }; WineD3DGlobalStatistics *wineD3DGlobalStatistics = NULL; @@ -274,6 +275,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) else ERR("VideoMemorySize is %i but must be >0\n", TmpVideoMemorySize); } + if ( !get_config_key( hkey, appkey, "WineLogo", buffer, size) ) + { + wined3d_settings.logo = HeapAlloc(GetProcessHeap(), 0, strlen(buffer) + 1); + if(wined3d_settings.logo) strcpy(wined3d_settings.logo, buffer); + } } 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 7fa0335..b6f4bee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -197,6 +197,7 @@ typedef struct wined3d_settings_s { int rendertargetlock_mode; /* Memory tracking and object counting */ unsigned int emulated_textureram; + char *logo; } wined3d_settings_t; extern wined3d_settings_t wined3d_settings; @@ -728,6 +729,9 @@ struct IWineD3DDeviceImpl BOOL haveHardwareCursor; HCURSOR hardwareCursor; + /* The Wine logo surface */ + IWineD3DSurface *logo_surface; + /* Textures for when no other textures are mapped */ UINT dummyTextureName[MAX_TEXTURES];

1 0

Rob Shearman : ntdll: Add a stub implementation of FSCTL_PIPE_IMPERSONATE that just impersonates the token of the current process .
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: 247b0c9b8e954b9eb4a16fa91027e648458a566d URL: http://source.winehq.org/git/wine.git/?a=commit;h=247b0c9b8e954b9eb4a16fa91… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Sep 13 14:03:48 2007 +0100 ntdll: Add a stub implementation of FSCTL_PIPE_IMPERSONATE that just impersonates the token of the current process. --- dlls/kernel32/tests/pipe.c | 8 -------- dlls/ntdll/file.c | 5 +++++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 18cc233..09f406e 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -961,21 +961,17 @@ static void test_ImpersonateNamedPipeClient(HANDLE hClientToken, DWORD security_ ok(ret, "ReadFile failed with error %d\n", GetLastError()); ret = ImpersonateNamedPipeClient(hPipeServer); - todo_wine ok(ret, "ImpersonateNamedPipeClient failed with error %d\n", GetLastError()); ret = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &hToken); - todo_wine ok(ret, "OpenThreadToken failed with error %d\n", GetLastError()); (*test_func)(0, hToken); ImpersonationLevel = 0xdeadbeef; /* to avoid false positives */ ret = GetTokenInformation(hToken, TokenImpersonationLevel, &ImpersonationLevel, sizeof(ImpersonationLevel), &size); - todo_wine { ok(ret, "GetTokenInformation(TokenImpersonationLevel) failed with error %d\n", GetLastError()); ok(ImpersonationLevel == SecurityImpersonation, "ImpersonationLevel should have been SecurityImpersonation(%d) instead of %d\n", SecurityImpersonation, ImpersonationLevel); - } CloseHandle(hToken); @@ -988,11 +984,9 @@ static void test_ImpersonateNamedPipeClient(HANDLE hClientToken, DWORD security_ ok(ret, "ReadFile failed with error %d\n", GetLastError()); ret = ImpersonateNamedPipeClient(hPipeServer); - todo_wine ok(ret, "ImpersonateNamedPipeClient failed with error %d\n", GetLastError()); ret = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &hToken); - todo_wine ok(ret, "OpenThreadToken failed with error %d\n", GetLastError()); (*test_func)(1, hToken); @@ -1007,7 +1001,6 @@ static void test_ImpersonateNamedPipeClient(HANDLE hClientToken, DWORD security_ WaitForSingleObject(hThread, INFINITE); ret = ImpersonateNamedPipeClient(hPipeServer); - todo_wine ok(ret, "ImpersonateNamedPipeClient failed with error %d\n", GetLastError()); RevertToSelf(); @@ -1135,7 +1128,6 @@ static void test_dynamic_context_no_token(int call_index, HANDLE hToken) switch (call_index) { case 0: - todo_wine ok(are_all_privileges_disabled(hToken), "token should be a copy of the process one\n"); break; case 1: diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index c7004d7..e920504 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1186,6 +1186,11 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc } break; + case FSCTL_PIPE_IMPERSONATE: + FIXME("FSCTL_PIPE_DISCONNECT: impersonating self\n"); + status = RtlImpersonateSelf( SecurityImpersonation ); + break; + case FSCTL_LOCK_VOLUME: case FSCTL_UNLOCK_VOLUME: FIXME("stub! return success - Unsupported fsctl %x (device=%x access=%x func=%x method=%x)\n",

1 0

Stefan Dösinger : wined3d: Pixel shader 1. x constants are clamped to [-1;1].
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: 72483540671e4796a12ce4943290479bc1817cf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72483540671e4796a12ce4943… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Sep 13 13:34:29 2007 +0200 wined3d: Pixel shader 1.x constants are clamped to [-1;1]. --- dlls/d3d9/tests/visual.c | 306 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/arb_program_shader.c | 46 +++++- dlls/wined3d/baseshader.c | 14 ++ dlls/wined3d/glsl_shader.c | 55 ++++++-- 4 files changed, 404 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72483540671e4796a12ce…

1 0

Rob Shearman : advapi32: Fix ImpersonateNamedPipeClient to pass in a pointer to an IO_STATUS_BLOCK to NtFsControl .
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: bcfe9544517f4a5045da87837e5da3c01c732e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcfe9544517f4a5045da87837… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Sep 13 14:03:20 2007 +0100 advapi32: Fix ImpersonateNamedPipeClient to pass in a pointer to an IO_STATUS_BLOCK to NtFsControl. Otherwise, NtFsControl file won't do anything except return STATUS_INVALID_PARAMETER. --- dlls/advapi32/security.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 7de2ab8..4c41e0c 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1267,10 +1267,12 @@ BOOL WINAPI InitializeAcl(PACL acl, DWORD size, DWORD rev) BOOL WINAPI ImpersonateNamedPipeClient( HANDLE hNamedPipe ) { + IO_STATUS_BLOCK io_block; + TRACE("(%p)\n", hNamedPipe); - return set_ntstatus( NtFsControlFile(hNamedPipe, NULL, NULL, NULL, NULL, - FSCTL_PIPE_IMPERSONATE, NULL, 0, NULL, 0) ); + return set_ntstatus( NtFsControlFile(hNamedPipe, NULL, NULL, NULL, + &io_block, FSCTL_PIPE_IMPERSONATE, NULL, 0, NULL, 0) ); } /******************************************************************************

1 0