August 2009 - Wine-commits - list.winehq.org

Ge van Geldorp : advapi32/tests: Fix tests on Win7.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 227cbdea9b1928db8ce9cb974c2c5f5c17a7aba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=227cbdea9b1928db8ce9cb974… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Wed Aug 26 12:40:29 2009 +0200 advapi32/tests: Fix tests on Win7. --- dlls/advapi32/tests/security.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4072168..dfcd45b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2396,7 +2396,8 @@ static void test_impersonation_level(void) /* can't perform access check when opening object against an anonymous impersonation token */ todo_wine { error = RegOpenKeyEx(HKEY_CURRENT_USER, "Software", 0, KEY_READ, &hkey); - ok(error == ERROR_INVALID_HANDLE, "RegOpenKeyEx should have failed with ERROR_INVALID_HANDLE instead of %d\n", error); + ok(error == ERROR_INVALID_HANDLE || error == ERROR_CANT_OPEN_ANONYMOUS, + "RegOpenKeyEx should have failed with ERROR_INVALID_HANDLE or ERROR_CANT_OPEN_ANONYMOUS instead of %d\n", error); } RevertToSelf(); @@ -2449,7 +2450,8 @@ static void test_impersonation_level(void) /* can't perform access check when opening object against an identification impersonation token */ error = RegOpenKeyEx(HKEY_CURRENT_USER, "Software", 0, KEY_READ, &hkey); todo_wine { - ok(error == ERROR_INVALID_HANDLE, "RegOpenKeyEx should have failed with ERROR_INVALID_HANDLE instead of %d\n", error); + ok(error == ERROR_INVALID_HANDLE || error == ERROR_BAD_IMPERSONATION_LEVEL, + "RegOpenKeyEx should have failed with ERROR_INVALID_HANDLE or ERROR_BAD_IMPERSONATION_LEVEL instead of %d\n", error); } ret = PrivilegeCheck(Token, PrivilegeSet, &AccessGranted); ok(ret, "PrivilegeCheck for SecurityIdentification failed with error %d\n", GetLastError()); @@ -3050,20 +3052,25 @@ static void test_PrivateObjectSecurity(void) "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); ok(retSize <= dwDescSize, "Buffer too small (%d vs %d)\n", retSize, dwDescSize); ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed err=%u\n", GetLastError()); - CHECK_RESULT_AND_FREE("G:S-1-5-21-93476-23408-4576D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)"); + CHECK_ONE_OF_AND_FREE("G:S-1-5-21-93476-23408-4576D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)", + "G:S-1-5-21-93476-23408-4576D:P(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)"); /* Win7 */ GetSecurityDescriptorControl(buf, &ctrl, &dwRevision); - expect_eq(ctrl, 0x8004, int, "%x"); + expect_eq(ctrl & (~ SE_DACL_PROTECTED), 0x8004, int, "%x"); ok(GetPrivateObjectSecurity(sec, sec_info, buf, dwDescSize, &retSize), "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); ok(retSize == dwDescSize, "Buffer too small (%d vs %d)\n", retSize, dwDescSize); ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); - CHECK_RESULT_AND_FREE("O:SY" + CHECK_ONE_OF_AND_FREE("O:SY" "G:S-1-5-21-93476-23408-4576" "D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)" - "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)"); + "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", + "O:SY" + "G:S-1-5-21-93476-23408-4576" + "D:P(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)" + "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)"); /* Win7 */ GetSecurityDescriptorControl(buf, &ctrl, &dwRevision); - expect_eq(ctrl, 0x8014, int, "%x"); + expect_eq(ctrl & (~ SE_DACL_PROTECTED), 0x8014, int, "%x"); SetLastError(0xdeadbeef); ok(GetPrivateObjectSecurity(sec, sec_info, buf, 5, &retSize) == FALSE, "GetPrivateObjectSecurity should have failed\n");

1 0

Ge van Geldorp : advapi32/tests: Add acceptable error codes for Win7.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 8bd5619e72b082fbf82fd442818275c12e28d8ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bd5619e72b082fbf82fd4428… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Wed Aug 26 12:38:27 2009 +0200 advapi32/tests: Add acceptable error codes for Win7. --- dlls/advapi32/tests/cred.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index ad06fd5..8d66ed0 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -101,8 +101,8 @@ static void test_CredWriteA(void) ret = pCredWriteA(&new_cred, 0); if (ret) { - /* Vista */ - ok(GetLastError() == ERROR_IO_PENDING, + ok(GetLastError() == ERROR_SUCCESS || + GetLastError() == ERROR_IO_PENDING, /* Vista */ "Expected ERROR_IO_PENDING, got %d\n", GetLastError()); } else

1 0

Stefan Dösinger : wined3d: Make it clear that glFlush and glFinish are WGL functions.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 52731a80c86758825eff0e0623c3ac98d9ae42ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=52731a80c86758825eff0e062… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 26 11:44:34 2009 +0200 wined3d: Make it clear that glFlush and glFinish are WGL functions. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 10 +++++----- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_gl.h | 9 ++++++--- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c17d7b6..00a4c96 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4854,7 +4854,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndScene(IWineD3DDevice *iface) { ActivateContext(This, NULL, CTXUSAGE_RESOURCELOAD); /* We only have to do this if we need to read the, swapbuffers performs a flush for us */ - glFlush(); + wglFlush(); /* No checkGLcall here to avoid locking the lock just for checking a call that hardly ever * fails */ @@ -5067,7 +5067,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { if (target == (IWineD3DSurfaceImpl*) swapchain->frontBuffer) { - glFlush(); + wglFlush(); } IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3d287f0..64f04fc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -576,7 +576,7 @@ static void test_pbo_functionality(struct wined3d_gl_info *gl_info) checkGLcall("Loading the PBO test texture"); GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - glFinish(); /* just to be sure */ + wglFinish(); /* just to be sure */ memset(check, 0, sizeof(check)); glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, check); @@ -4646,11 +4646,11 @@ BOOL InitAdapters(IWineD3DImpl *This) * otherwise because we have to use winex11.drv's override */ #ifdef USE_WIN32_OPENGL - glFinish = (void*)GetProcAddress(mod_gl, "glFinish"); - glFlush = (void*)GetProcAddress(mod_gl, "glFlush"); + wglFinish = (void*)GetProcAddress(mod_gl, "glFinish"); + wglFlush = (void*)GetProcAddress(mod_gl, "glFlush"); #else - glFinish = (void*)pwglGetProcAddress("wglFinish"); - glFlush = (void*)pwglGetProcAddress("wglFlush"); + wglFinish = (void*)pwglGetProcAddress("wglFinish"); + wglFlush = (void*)pwglGetProcAddress("wglFlush"); #endif glEnableWINE = glEnable; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 82612a3..6705449 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3814,7 +3814,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const /* Flush in case the drawable is used by multiple GL contexts */ if(dstSwapchain && (This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer || dstSwapchain->num_contexts >= 2)) - glFlush(); + wglFlush(); /* TODO: If the surface is locked often, perform the Blt in software on the memory instead */ /* The surface is now in the drawable. On onscreen surfaces or without fbos the texture @@ -4680,7 +4680,7 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT /* Make sure to flush the buffers. This is needed in apps like Red Alert II and Tiberian SUN that use multiple WGL contexts. */ if(((IWineD3DSwapChainImpl*)swapchain)->frontBuffer == (IWineD3DSurface*)This || ((IWineD3DSwapChainImpl*)swapchain)->num_contexts >= 2) - glFlush(); + wglFlush(); IWineD3DSwapChain_Release(swapchain); } else { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8ff55b0..f5f5e18 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1141,10 +1141,13 @@ void (WINE_GLAPI *glViewport) (GLint x, GLint y, GLsizei width, GLsizei height); void (WINE_GLAPI *glPointParameterfv) (GLenum pname, const GLfloat *params); /* glFinish and glFlush are always loaded from opengl32.dll, thus they always have - * __stdcall calling convention + * __stdcall calling convention. + * + * They are wgl functions and must not be called inside the gl lock, give them a + * name that makes this clear */ -void (__stdcall *glFinish) (); -void (__stdcall *glFlush) (); +void (__stdcall *wglFinish) (); +void (__stdcall *wglFlush) (); /* WGL functions */ HGLRC (WINAPI *pwglCreateContext)(HDC);

1 0

Stefan Dösinger : wined3d: Don' t use WINED3DADAPTER_DEFAULT as refresh rate.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 21f4e42a9830d78c74ffbf867614a1811a3fc3d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21f4e42a9830d78c74ffbf867… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 26 10:24:09 2009 +0200 wined3d: Don't use WINED3DADAPTER_DEFAULT as refresh rate. --- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c114711..3d287f0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2191,7 +2191,7 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte if (EnumDisplaySettingsExW(NULL, ModeIdx, &DevModeW, 0)) { pMode->Width = DevModeW.dmPelsWidth; pMode->Height = DevModeW.dmPelsHeight; - pMode->RefreshRate = WINED3DADAPTER_DEFAULT; + pMode->RefreshRate = DEFAULT_REFRESH_RATE; if (DevModeW.dmFields & DM_DISPLAYFREQUENCY) pMode->RefreshRate = DevModeW.dmDisplayFrequency; @@ -2238,7 +2238,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterDisplayMode(IWineD3D *iface, UINT A pMode->Width = DevModeW.dmPelsWidth; pMode->Height = DevModeW.dmPelsHeight; bpp = DevModeW.dmBitsPerPel; - pMode->RefreshRate = WINED3DADAPTER_DEFAULT; + pMode->RefreshRate = DEFAULT_REFRESH_RATE; if (DevModeW.dmFields&DM_DISPLAYFREQUENCY) { pMode->RefreshRate = DevModeW.dmDisplayFrequency; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3627078..e5bd086 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2495,6 +2495,8 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface, struct wined3d_context *IWineD3DSwapChainImpl_CreateContextForThread(IWineD3DSwapChain *iface); +#define DEFAULT_REFRESH_RATE 0 + /***************************************************************************** * Utility function prototypes */

1 0

Stefan Dösinger : wined3d: Initialize ps_arb_max_local_constants.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 3f6909c1f2bb952f7394fa13843e3c44c3895e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6909c1f2bb952f7394fa138… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 24 16:03:13 2009 +0200 wined3d: Initialize ps_arb_max_local_constants. --- dlls/wined3d/directx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 23a3723..c114711 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1873,6 +1873,9 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, &gl_max)); gl_info->ps_arb_max_instructions = gl_max; TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM native instructions: %d.\n", gl_info->ps_arb_max_instructions); + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB, &gl_max)); + gl_info->ps_arb_max_local_constants = gl_max; + TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM local parameters: %d.\n", gl_info->ps_arb_max_instructions); } if (gl_info->supported[ARB_VERTEX_PROGRAM]) {

1 0

Louis Lenders : shdocvw.inf: Add default registry key " HKCU\Software\Microsoft\Internet Explorer\Settings.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 929c80dcb7dd317c771d1b18a11aaaf9792be554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=929c80dcb7dd317c771d1b18a… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Aug 26 09:21:45 2009 +0200 shdocvw.inf: Add default registry key "HKCU\Software\Microsoft\Internet Explorer\Settings. --- dlls/shdocvw/shdocvw.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index d67443d..92e7884 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -142,6 +142,7 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","www",,"http://" [Settings.Reg] HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" +HKCU,"Software\Microsoft\Internet Explorer\Settings","Text Color",2,"0,0,0" HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.winehq.org" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe",,,"%16422%\Internet Explorer\iexplore.exe" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",,"%16422%\Internet Explorer;"

1 0

Davide Pizzetti : winhlp32: Italian translation update.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: a60ff2315895c2e86cf2e802eed185afb6106ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60ff2315895c2e86cf2e802e… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Tue Aug 25 22:49:52 2009 +0200 winhlp32: Italian translation update. --- programs/winhlp32/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/It.rc b/programs/winhlp32/It.rc index 3f0ffd2..b5c5392 100644 --- a/programs/winhlp32/It.rc +++ b/programs/winhlp32/It.rc @@ -31,7 +31,7 @@ MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL MENUITEM "&Apri...", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "S&tampa", MNID_FILE_PRINT - MENUITEM "&Setup stampante...", MNID_FILE_SETUP + MENUITEM "&Installazione stampante...", MNID_FILE_SETUP MENUITEM SEPARATOR MENUITEM "&Esci", MNID_FILE_EXIT }

1 0

Davide Pizzetti : regedit: Italian translation update.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 46a3113a0ca9e51fcf6560c12915359c1ff7cefa URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a3113a0ca9e51fcf6560c12… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Tue Aug 25 22:46:11 2009 +0200 regedit: Italian translation update. --- programs/regedit/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/It.rc b/programs/regedit/It.rc index e06aa67..dc57e8f 100644 --- a/programs/regedit/It.rc +++ b/programs/regedit/It.rc @@ -156,7 +156,7 @@ BEGIN LTEXT "Nome:",IDC_STATIC,5,5,119,8 LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL DEFPUSHBUTTON "OK",IDOK,140,73,30,11,WS_GROUP -PUSHBUTTON "Cancella",IDCANCEL,175,73,30,11, WS_GROUP +PUSHBUTTON "Annulla",IDCANCEL,175,73,30,11, WS_GROUP END IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75

1 0

Francois Gouget : riched20: Make ME_SetCursorToEnd() static.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 6e80d875d49536f5a8a62fd9ddbb8f89a62465af URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e80d875d49536f5a8a62fd9d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 26 10:54:58 2009 +0200 riched20: Make ME_SetCursorToEnd() static. --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 096d0d5..fdcb924 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -31,7 +31,7 @@ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) cursor->nOffset = 0; } -void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor) +static void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor) { cursor->pPara = editor->pBuffer->pLast->member.para.prev_para; cursor->pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 9b9ab4e..7edd86f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -155,7 +155,6 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod); /* caret.c */ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor); -void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor); int ME_SetSelection(ME_TextEditor *editor, int from, int to); void ME_HideCaret(ME_TextEditor *ed); void ME_ShowCaret(ME_TextEditor *ed);

1 0

Francois Gouget : windowscodecs/tests: Make some functions static.
by Alexandre Julliard 26 Aug '09

26 Aug '09

Module: wine Branch: master Commit: 798af6fe2790e76e0c327b3ebebb7ec183a0bece URL: http://source.winehq.org/git/wine.git/?a=commit;h=798af6fe2790e76e0c327b3eb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 26 10:54:50 2009 +0200 windowscodecs/tests: Make some functions static. --- dlls/windowscodecs/tests/converter.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index d736b1f..06067e3 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -159,7 +159,7 @@ static const IWICBitmapSourceVtbl BitmapTestSrc_Vtbl = { BitmapTestSrc_CopyPixels }; -void CreateTestBitmap(const bitmap_data *data, IWICBitmapSource **bitmap) +static void CreateTestBitmap(const bitmap_data *data, IWICBitmapSource **bitmap) { BitmapTestSrc *This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapTestSrc)); @@ -174,7 +174,7 @@ void CreateTestBitmap(const bitmap_data *data, IWICBitmapSource **bitmap) *bitmap = NULL; } -void DeleteTestBitmap(IWICBitmapSource *bitmap) +static void DeleteTestBitmap(IWICBitmapSource *bitmap) { BitmapTestSrc *This = (BitmapTestSrc*)bitmap; ok(This->lpVtbl == &BitmapTestSrc_Vtbl, "test bitmap %p deleted with incorrect vtable\n", bitmap); @@ -182,7 +182,7 @@ void DeleteTestBitmap(IWICBitmapSource *bitmap) HeapFree(GetProcessHeap(), 0, This); } -void compare_bitmap_data(const struct bitmap_data *expect, IWICBitmapSource *source, const char *name) +static void compare_bitmap_data(const struct bitmap_data *expect, IWICBitmapSource *source, const char *name) { BYTE *converted_bits; UINT width, height; @@ -248,7 +248,7 @@ static const BYTE bits_32bppBGRA[] = { static const struct bitmap_data testdata_32bppBGRA = { &GUID_WICPixelFormat32bppBGRA, 32, bits_32bppBGRA, 4, 2, 96.0, 96.0}; -void test_conversion(const struct bitmap_data *src, const struct bitmap_data *dst, const char *name, BOOL todo) +static void test_conversion(const struct bitmap_data *src, const struct bitmap_data *dst, const char *name, BOOL todo) { IWICBitmapSource *src_bitmap, *dst_bitmap; HRESULT hr; @@ -271,7 +271,7 @@ void test_conversion(const struct bitmap_data *src, const struct bitmap_data *ds DeleteTestBitmap(src_bitmap); } -void test_invalid_conversion(void) +static void test_invalid_conversion(void) { IWICBitmapSource *src_bitmap, *dst_bitmap; HRESULT hr; @@ -285,7 +285,7 @@ void test_invalid_conversion(void) DeleteTestBitmap(src_bitmap); } -void test_default_converter(void) +static void test_default_converter(void) { IWICBitmapSource *src_bitmap; IWICFormatConverter *converter;

1 0