December 2007 - Wine-commits

Stefan Dösinger : wined3d: Test clearing regarding the scissor test and colorwrite.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: f4d244924421a25c34c3855fd0855026e0200a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d244924421a25c34c3855fd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 5 21:35:32 2007 +0100 wined3d: Test clearing regarding the scissor test and colorwrite. --- dlls/d3d9/tests/visual.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 40 ++++++++++++---------- 2 files changed, 107 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2403881..09f24b2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -277,6 +277,8 @@ static void clear_test(IDirect3DDevice9 *device) D3DRECT rect_negneg; DWORD color; D3DVIEWPORT9 old_vp, vp; + RECT scissor; + DWORD oldColorWrite; hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); @@ -379,6 +381,89 @@ static void clear_test(IDirect3DDevice9 *device) ok(color == 0x00ffffff, "(478,362) has color %08x\n", color); color = getPixelColor(device, 482, 362); ok(color == 0x00ffffff, "(482,362) has color %08x\n", color); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + scissor.left = 160; + scissor.right = 480; + scissor.top = 120; + scissor.bottom = 360; + hr = IDirect3DDevice9_SetScissorRect(device, &scissor); + ok(hr == D3D_OK, "IDirect3DDevice_SetScissorRect failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SCISSORTESTENABLE, TRUE); + ok(hr == D3D_OK, "IDirect3DDevice_SetScissorRect failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Clear(device, 1, &rect[1], D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SCISSORTESTENABLE, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice_SetScissorRect failed with %s\n", DXGetErrorString9(hr)); + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + color = getPixelColor(device, 158, 118); + ok(color == 0x00ffffff, "Pixel 158/118 has color %08x\n", color); + color = getPixelColor(device, 162, 118); + ok(color == 0x00ffffff, "Pixel 162/118 has color %08x\n", color); + color = getPixelColor(device, 158, 122); + ok(color == 0x00ffffff, "Pixel 158/122 has color %08x\n", color); + color = getPixelColor(device, 162, 122); + ok(color == 0x00ff0000, "Pixel 162/122 has color %08x\n", color); + + color = getPixelColor(device, 158, 358); + ok(color == 0x00ffffff, "Pixel 158/358 has color %08x\n", color); + color = getPixelColor(device, 162, 358); + ok(color == 0x0000ff00, "Pixel 162/358 has color %08x\n", color); + color = getPixelColor(device, 158, 358); + ok(color == 0x00ffffff, "Pixel 158/358 has color %08x\n", color); + color = getPixelColor(device, 162, 362); + ok(color == 0x00ffffff, "Pixel 162/362 has color %08x\n", color); + + color = getPixelColor(device, 478, 118); + ok(color == 0x00ffffff, "Pixel 158/118 has color %08x\n", color); + color = getPixelColor(device, 478, 122); + ok(color == 0x0000ff00, "Pixel 162/118 has color %08x\n", color); + color = getPixelColor(device, 482, 122); + ok(color == 0x00ffffff, "Pixel 158/122 has color %08x\n", color); + color = getPixelColor(device, 482, 358); + ok(color == 0x00ffffff, "Pixel 162/122 has color %08x\n", color); + + color = getPixelColor(device, 478, 358); + ok(color == 0x0000ff00, "Pixel 478/358 has color %08x\n", color); + color = getPixelColor(device, 478, 362); + ok(color == 0x00ffffff, "Pixel 478/118 has color %08x\n", color); + color = getPixelColor(device, 482, 358); + ok(color == 0x00ffffff, "Pixel 482/122 has color %08x\n", color); + color = getPixelColor(device, 482, 362); + ok(color == 0x00ffffff, "Pixel 482/122 has color %08x\n", color); + + color = getPixelColor(device, 318, 238); + ok(color == 0x00ff0000, "Pixel 318/238 has color %08x\n", color); + color = getPixelColor(device, 318, 242); + ok(color == 0x0000ff00, "Pixel 318/242 has color %08x\n", color); + color = getPixelColor(device, 322, 238); + ok(color == 0x0000ff00, "Pixel 322/238 has color %08x\n", color); + color = getPixelColor(device, 322, 242); + ok(color == 0x0000ff00, "Pixel 322/242 has color %08x\n", color); + + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_COLORWRITEENABLE, &oldColorWrite); + ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderState failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_RED); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORWRITEENABLE, oldColorWrite); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %s\n", DXGetErrorString9(hr)); + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + + /* Colorwriteenable does not affect the clear */ + color = getPixelColor(device, 320, 240); + ok(color == 0x00ffffff, "Color write protected clear returned color %08x\n", color); } typedef struct { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1e53bcc..e5f1c96 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4816,6 +4816,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); break; } + if(This->stateBlock->renderState[WINED3DRS_SCISSORTESTENABLE] && ( + This->stateBlock->scissorRect.left > 0 || This->stateBlock->scissorRect.top > 0 || + This->stateBlock->scissorRect.right < target->currentDesc.Width || + This->stateBlock->scissorRect.bottom < target->currentDesc.Height)) { + IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); + break; + } if(Count > 0 && pRects && ( pRects[0].x1 > 0 || pRects[0].y1 > 0 || pRects[0].x2 < target->currentDesc.Width || @@ -4868,35 +4875,32 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun glMask = glMask | GL_COLOR_BUFFER_BIT; } + vp_rect.left = vp->X; + vp_rect.top = vp->Y; + vp_rect.right = vp->X + vp->Width; + vp_rect.bottom = vp->Y + vp->Height; if (!(Count > 0 && pRects)) { - if (This->render_offscreen) { - glScissor(This->stateBlock->viewport.X, - This->stateBlock->viewport.Y, - This->stateBlock->viewport.Width, - This->stateBlock->viewport.Height); + if(This->stateBlock->renderState[WINED3DRS_SCISSORTESTENABLE]) { + IntersectRect(&vp_rect, &vp_rect, &This->stateBlock->scissorRect); + } + if(This->render_offscreen) { + glScissor(vp_rect.left, vp_rect.top, + vp_rect.right - vp_rect.left, vp_rect.bottom - vp_rect.top); } else { - glScissor(This->stateBlock->viewport.X, - (drawable_height - - (This->stateBlock->viewport.Y + This->stateBlock->viewport.Height)), - This->stateBlock->viewport.Width, - This->stateBlock->viewport.Height); + glScissor(vp_rect.left, drawable_height - vp_rect.bottom, + vp_rect.right - vp_rect.left, vp_rect.bottom - vp_rect.top); } checkGLcall("glScissor"); glClear(glMask); checkGLcall("glClear"); } else { - /* The viewport cap still applies, we have to intersect each clear rect with the viewport - * range because glClear ignores the viewport(and the viewport isn't even applied in this state) - */ - vp_rect.left = vp->X; - vp_rect.top = vp->Y; - vp_rect.right = vp->X + vp->Width; - vp_rect.bottom = vp->Y + vp->Height; - /* Now process each rect in turn */ for (i = 0; i < Count; i++) { /* Note gl uses lower left, width/height */ IntersectRect((RECT *) &curRect, &vp_rect, (RECT *) &pRects[i]); + if(This->stateBlock->renderState[WINED3DRS_SCISSORTESTENABLE]) { + IntersectRect((RECT *) &curRect, (RECT *) &curRect, &This->stateBlock->scissorRect); + } TRACE("(%p) Rect=(%d,%d)->(%d,%d) glRect=(%d,%d), len=%d, hei=%d\n", This, pRects[i].x1, pRects[i].y1, pRects[i].x2, pRects[i].y2, curRect.x1, (target->currentDesc.Height - curRect.y2),

1 0

Stefan Dösinger : wined3d: Ignore unused attributes when generating the swizzle array.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: 1cc7530332797b30dd2382b923cbf91919771128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc7530332797b30dd2382b92… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 5 22:03:34 2007 +0100 wined3d: Ignore unused attributes when generating the swizzle array. --- dlls/wined3d/vertexshader.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 37a3705..f67cbae 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -296,6 +296,9 @@ static inline void find_swizzled_attribs(IWineD3DVertexDeclaration *declaration, for(i = 0; i < decl->num_swizzled_attribs; i++) { for(j = 0; j < MAX_ATTRIBS; j++) { + + if(!This->baseShader.reg_maps.attributes[j]) continue; + usage_token = This->semantics_in[j].usage; usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; @@ -679,7 +682,7 @@ static inline BOOL swizzled_attribs_differ(IWineD3DVertexShaderImpl *This, IWine for(i = 0; i < vdecl->declarationWNumElements; i++) { for(j = 0; j < MAX_ATTRIBS; j++) { - if(!This->baseShader.reg_maps.attributes) continue; + if(!This->baseShader.reg_maps.attributes[j]) continue; usage_token = This->semantics_in[j].usage; usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT;

1 0

Roy Shea : qmgr: Renamed bits_main.c to qmgr_main.c and updated comments.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: b655da64122ea7bb80dc44a4d602598bb39a5fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b655da64122ea7bb80dc44a4d… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Wed Dec 5 17:23:41 2007 -0800 qmgr: Renamed bits_main.c to qmgr_main.c and updated comments. --- dlls/qmgr/Makefile.in | 2 +- dlls/qmgr/{bits_main.c => qmgr_main.c} | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index 24dc03b..5ac07d3 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -7,7 +7,7 @@ IMPORTS = kernel32 EXTRALIBS = C_SRCS = \ - bits_main.c + qmgr_main.c @MAKE_DLL_RULES@ diff --git a/dlls/qmgr/bits_main.c b/dlls/qmgr/qmgr_main.c similarity index 77% rename from dlls/qmgr/bits_main.c rename to dlls/qmgr/qmgr_main.c index 76321ca..d00ac2d 100644 --- a/dlls/qmgr/bits_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -1,5 +1,5 @@ /* - * Implementation of qmgr.dll + * Main DLL interface to Queue Manager (BITS) * * Background Intelligent Transfer Service (BITS) interface. Dll is named * qmgr for backwards compatibility with early versions of BITS. @@ -25,24 +25,25 @@ #include "windef.h" #include "winbase.h" + #include "wine/debug.h" -#include "objbase.h" -WINE_DEFAULT_DEBUG_CHANNEL(bits); +WINE_DEFAULT_DEBUG_CHANNEL(qmgr); +/* Entry point for DLL */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; } return TRUE;

1 0

Luis C. Busquets Pérez : shell32: Update Spanish resource.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: cba3c81f6e26e07879ebe5e16b74bfee6edeebfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba3c81f6e26e07879ebe5e16… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Wed Dec 5 21:25:46 2007 +0100 shell32: Update Spanish resource. --- dlls/shell32/shell32_Es.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Es.rc b/dlls/shell32/shell32_Es.rc index 9e9ef52..6d13a30 100644 --- a/dlls/shell32/shell32_Es.rc +++ b/dlls/shell32/shell32_Es.rc @@ -76,7 +76,7 @@ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN + MENUITEM "&Seleccionar" FCIDM_SHVIEW_OPEN MENUITEM "E&xplorar", FCIDM_SHVIEW_EXPLORE MENUITEM "&Abrir", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR

1 0

Luis C. Busquets Pérez : browseui: Add Spanish resource.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: be3e29738cf27b0a201e1b239adbb631b5b0ef5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3e29738cf27b0a201e1b239… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Wed Dec 5 21:35:35 2007 +0100 browseui: Add Spanish resource. --- dlls/browseui/rsrc.rc | 1 + dlls/browseui/rsrc_Es.rc | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/rsrc.rc b/dlls/browseui/rsrc.rc index 5d367bd..96f39f7 100644 --- a/dlls/browseui/rsrc.rc +++ b/dlls/browseui/rsrc.rc @@ -25,6 +25,7 @@ #include "version.rc" #include "rsrc_En.rc" +#include "rsrc_Es.rc" #include "rsrc_Fr.rc" #include "rsrc_Ko.rc" #include "rsrc_No.rc" diff --git a/dlls/browseui/rsrc_Es.rc b/dlls/browseui/rsrc_Es.rc new file mode 100644 index 0000000..d1478a8 --- /dev/null +++ b/dlls/browseui/rsrc_Es.rc @@ -0,0 +1,38 @@ +/* + * Copyright 2007 Luis Carlos Busquets Pérez + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CANCELLING "Cancelando..." +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "&Cancelar", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +}

1 0

Luis C. Busquets Pérez : wineboot: Added Spanish resource.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: ce204283f54633af83198437ac74536228519c5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce204283f54633af83198437a… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Wed Dec 5 21:38:51 2007 +0100 wineboot: Added Spanish resource. --- programs/wineboot/wineboot.rc | 1 + programs/wineboot/wineboot_Es.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc index 369eace..5207f25 100644 --- a/programs/wineboot/wineboot.rc +++ b/programs/wineboot/wineboot.rc @@ -28,6 +28,7 @@ #include "resource.h" #include "wineboot_En.rc" +#include "wineboot_Es.rc" #include "wineboot_Fr.rc" #include "wineboot_Ko.rc" #include "wineboot_No.rc" diff --git a/programs/wineboot/wineboot_Es.rc b/programs/wineboot/wineboot_Es.rc new file mode 100644 index 0000000..4af1677 --- /dev/null +++ b/programs/wineboot/wineboot_Es.rc @@ -0,0 +1,35 @@ +/* + * WineBoot resources + * + * Copyright 2007 Luis Carlos Busquets Pérez + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Esperando al programa" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Cancelar",IDCANCEL,129,49,50,15 + PUSHBUTTON "Terminar proceso",IDOK,51,49,71,15 + LTEXT "Desconexión simulada o apagado en progreso, pero el programa no responde.", + IDC_STATIC,7,7,172,19 + LTEXT "Si termina el programa puede perder los datos no grabados.", + IDC_STATIC,7,28,172,15 +END

1 0

Alexandre Julliard : shell32: Fix some wrc warnings.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: a76d60c5ab342d885d7c0064a2c3e61252d4878a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a76d60c5ab342d885d7c0064a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 6 12:43:05 2007 +0100 shell32: Fix some wrc warnings. --- dlls/shell32/shell32_Cs.rc | 15 ++------------- dlls/shell32/shell32_Uk.rc | 15 ++------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/shell32_Cs.rc b/dlls/shell32/shell32_Cs.rc index 05133a4..bf1b349 100644 --- a/dlls/shell32/shell32_Cs.rc +++ b/dlls/shell32/shell32_Cs.rc @@ -143,23 +143,15 @@ STRINGTABLE DISCARDABLE { IDS_DESKTOP "Plocha" IDS_MYCOMPUTER "Tento po��ta�" -} -/* - context menus -*/ -STRINGTABLE DISCARDABLE -{ + /* context menus */ IDS_VIEW_LARGE "&Vedle sebe" IDS_VIEW_SMALL "&Ikony" IDS_VIEW_LIST "&Seznam" IDS_VIEW_DETAILS "&Podrobnosti" IDS_SELECT "Vybrat" IDS_OPEN "Otev��t" -} -STRINGTABLE DISCARDABLE -{ IDS_CREATEFOLDER_DENIED "Nelze vytvo�it novou slo�ku proto�e p��stup byl odep�en." IDS_CREATEFOLDER_CAPTION "Chyba p�i pokusu vytvo�it nov� adres��" IDS_DELETEITEM_CAPTION "Potvrdit odstran�n� souboru" @@ -172,11 +164,8 @@ STRINGTABLE DISCARDABLE "If the files in the destination folder have the same names as files in the\n"\ "selected folder they will be replaced. Do you still want to move or copy\n"\ "the folder?" -} /* columns in the shellview */ -STRINGTABLE -BEGIN IDS_SHV_COLUMN1 "N�zev" IDS_SHV_COLUMN2 "Velikost" IDS_SHV_COLUMN3 "Typ" @@ -188,4 +177,4 @@ BEGIN IDS_SHV_COLUMN9 "Koment��" IDS_NEWFOLDER "New Folder" -END +} diff --git a/dlls/shell32/shell32_Uk.rc b/dlls/shell32/shell32_Uk.rc index 228c47d..2ffaf31 100644 --- a/dlls/shell32/shell32_Uk.rc +++ b/dlls/shell32/shell32_Uk.rc @@ -139,23 +139,15 @@ STRINGTABLE DISCARDABLE { IDS_DESKTOP "��" IDS_MYCOMPUTER "̳� ��'��" -} -/* - context menus -*/ -STRINGTABLE DISCARDABLE -{ + /* context menus */ IDS_VIEW_LARGE "&�� " IDS_VIEW_SMALL "&�� " IDS_VIEW_LIST "&��" IDS_VIEW_DETAILS "&��" IDS_SELECT "��&��" IDS_OPEN "³&��" -} -STRINGTABLE DISCARDABLE -{ IDS_CREATEFOLDER_DENIED "�� : ³�� ." IDS_CREATEFOLDER_CAPTION "�� " IDS_DELETEITEM_CAPTION "ϳ�� " @@ -168,11 +160,8 @@ STRINGTABLE DISCARDABLE "If the files in the destination folder have the same names as files in the\n"\ "selected folder they will be replaced. Do you still want to move or copy\n"\ "the folder?" -} /* columns in the shellview */ -STRINGTABLE -BEGIN IDS_SHV_COLUMN1 "��" IDS_SHV_COLUMN2 "��" IDS_SHV_COLUMN3 "��" @@ -182,4 +171,4 @@ BEGIN IDS_SHV_COLUMN7 "³�� " IDS_NEWFOLDER "New Folder" -END +}

1 0

Peter Oberndorfer : comctl32: Add EnumMRUList tests.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: dac63ff680de188bcef24087c008a96cbef82be2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dac63ff680de188bcef24087c… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Wed Dec 5 20:10:00 2007 +0100 comctl32: Add EnumMRUList tests. --- dlls/comctl32/tests/mru.c | 68 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 2893a10..bfcc385 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -68,11 +68,12 @@ static HMODULE hComctl32; static HANDLE (WINAPI *pCreateMRUListA)(LPCREATEMRULISTA); static void (WINAPI *pFreeMRUList)(HANDLE); static INT (WINAPI *pAddMRUStringA)(HANDLE,LPCSTR); +static INT (WINAPI *pEnumMRUList)(HANDLE,INT,LPVOID,DWORD); /* static INT (WINAPI *pFindMRUStringA)(HANDLE,LPCSTR,LPINT); -static INT (WINAPI *pEnumMRUList)(HANDLE,INT,LPVOID,DWORD); */ + static BOOL create_reg_entries(void) { HKEY hKey = NULL; @@ -162,8 +163,13 @@ static void test_MRUListA(void) pCreateMRUListA = (void*)GetProcAddress(hComctl32,(LPCSTR)151); pFreeMRUList = (void*)GetProcAddress(hComctl32,(LPCSTR)152); pAddMRUStringA = (void*)GetProcAddress(hComctl32,(LPCSTR)153); - if (!pCreateMRUListA || !pFreeMRUList || !pAddMRUStringA) + pEnumMRUList = (void*)GetProcAddress(hComctl32,(LPCSTR)154); + + if (!pCreateMRUListA || !pFreeMRUList || !pAddMRUStringA || !pEnumMRUList) + { + skip("MRU entry points not found\n"); return; + } if (0) { @@ -213,6 +219,7 @@ static void test_MRUListA(void) if (hMRU) { + char buffer[255]; checks[0] = "Test 1"; checks[1] = "Test 2"; checks[2] = "Test 3"; @@ -277,6 +284,63 @@ static void test_MRUListA(void) checks[0] = checks[3]; check_reg_entries("abc", checks); + /* NULL buffer = get list size */ + iRet = pEnumMRUList(hMRU, 0, NULL, 0); + ok(iRet == 3, "EnumMRUList expected %d, got %d\n", LIST_SIZE, iRet); + + todo_wine{ + /* negative item pos = get list size */ + iRet = pEnumMRUList(hMRU, -1, NULL, 0); + ok(iRet == 3, "EnumMRUList expected %d, got %d\n", LIST_SIZE, iRet); + + /* negative item pos = get list size */ + iRet = pEnumMRUList(hMRU, -5, NULL, 0); + ok(iRet == 3, "EnumMRUList expected %d, got %d\n", LIST_SIZE, iRet); + + /* negative item pos = get list size */ + iRet = pEnumMRUList(hMRU, -1, buffer, 255); + ok(iRet == 3, "EnumMRUList expected %d, got %d\n", LIST_SIZE, iRet); + + /* negative item pos = get list size */ + iRet = pEnumMRUList(hMRU, -5, buffer, 255); + ok(iRet == 3, "EnumMRUList expected %d, got %d\n", LIST_SIZE, iRet); + } + + /* check entry 0 */ + buffer[0] = 0; + iRet = pEnumMRUList(hMRU, 0, buffer, 255); + todo_wine ok(iRet == strlen(checks[3]), "EnumMRUList expected %d, got %d\n", strlen(checks[3]), iRet); + ok(strcmp(buffer, checks[3]) == 0, "EnumMRUList expected %s, got %s\n", checks[3], buffer); + + /* check entry 0 with a too small buffer */ + buffer[0] = 0; /* overwritten with 'T' */ + buffer[1] = 'A'; /* overwritten with 0 */ + buffer[2] = 'A'; /* unchanged */ + buffer[3] = 0; /* unchanged */ + iRet = pEnumMRUList(hMRU, 0, buffer, 2); + todo_wine ok(iRet == strlen(checks[3]), "EnumMRUList expected %d, got %d\n", strlen(checks[3]), iRet); + todo_wine ok(strcmp(buffer, "T") == 0, "EnumMRUList expected %s, got %s\n", "T", buffer); + /* make sure space after buffer has old values */ + ok(buffer[2] == 'A', "EnumMRUList expected %02x, got %02x\n", 'A', buffer[2]); + + /* check entry 1 */ + buffer[0] = 0; + iRet = pEnumMRUList(hMRU, 1, buffer, 255); + todo_wine ok(iRet == strlen(checks[1]), "EnumMRUList expected %d, got %d\n", strlen(checks[1]), iRet); + ok(strcmp(buffer, checks[1]) == 0, "EnumMRUList expected %s, got %s\n", checks[1], buffer); + + /* check entry 2 */ + buffer[0] = 0; + iRet = pEnumMRUList(hMRU, 2, buffer, 255); + todo_wine ok(iRet == strlen(checks[2]), "EnumMRUList expected %d, got %d\n", strlen(checks[2]), iRet); + ok(strcmp(buffer, checks[2]) == 0, "EnumMRUList expected %s, got %s\n", checks[2], buffer); + + /* check out of bounds entry 3 */ + strcpy(buffer, "dummy"); + iRet = pEnumMRUList(hMRU, 3, buffer, 255); + ok(iRet == -1, "EnumMRUList expected %d, got %d\n", -1, iRet); + ok(strcmp(buffer, "dummy") == 0, "EnumMRUList expected unchanged buffer %s, got %s\n", "dummy", buffer); + /* Finished with this MRU */ pFreeMRUList(hMRU); }

1 0

Rob Shearman : rpcrt4: Fix a memory leak when freeing an association by deleting the critical section .
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: 867cc3c05f110a2bb4c4112762397c8ffce82ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=867cc3c05f110a2bb4c411276… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 5 22:40:47 2007 +0000 rpcrt4: Fix a memory leak when freeing an association by deleting the critical section. --- dlls/rpcrt4/rpc_transport.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index fcd3d0c..0c893e8 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1541,6 +1541,8 @@ ULONG RpcAssoc_Release(RpcAssoc *assoc) HeapFree(GetProcessHeap(), 0, assoc->NetworkAddr); HeapFree(GetProcessHeap(), 0, assoc->Protseq); + DeleteCriticalSection(&assoc->cs); + HeapFree(GetProcessHeap(), 0, assoc); }

1 0

Rob Shearman : rpcrt4: Fix a memory leak caused by NdrFullPointerXlatFree not freeing the entries in the full pointer translation table .
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: 1b79da8be0b6097049a90a9b8d72a4aa14c50841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b79da8be0b6097049a90a9b8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 5 22:41:03 2007 +0000 rpcrt4: Fix a memory leak caused by NdrFullPointerXlatFree not freeing the entries in the full pointer translation table. --- dlls/rpcrt4/ndr_fullpointer.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index 5640769..3586bc3 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -63,8 +63,14 @@ PFULL_PTR_XLAT_TABLES WINAPI NdrFullPointerXlatInit(ULONG NumberOfPointers, void WINAPI NdrFullPointerXlatFree(PFULL_PTR_XLAT_TABLES pXlatTables) { + ULONG i; + TRACE("(%p)\n", pXlatTables); + /* free the entries in the table */ + for (i = 0; i < pXlatTables->RefIdToPointer.NumberOfEntries; i++) + HeapFree(GetProcessHeap(), 0, pXlatTables->RefIdToPointer.XlatTable[i]); + HeapFree(GetProcessHeap(), 0, pXlatTables->RefIdToPointer.XlatTable); HeapFree(GetProcessHeap(), 0, pXlatTables->RefIdToPointer.StateTable); HeapFree(GetProcessHeap(), 0, pXlatTables->PointerToRefId.XlatTable);

1 0