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

Roderick Colenbrander : wined3d: Improve pixelformat selection code.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 318f6068699e7d8b548f1753c014244effe2f746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=318f6068699e7d8b548f1753c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Aug 25 00:18:54 2007 +0200 wined3d: Improve pixelformat selection code. --- dlls/wined3d/context.c | 78 ++++++++++++++++++++++++++++++------------------ 1 files changed, 49 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2507835..ab1d91c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -131,6 +131,8 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar TRACE("(%p): Creating a %s context for render target %p\n", This, create_pbuffer ? "offscreen" : "onscreen", target); +#define PUSH1(att) attribs[nAttribs++] = (att); +#define PUSH2(att,value) attribs[nAttribs++] = (att); attribs[nAttribs++] = (value); if(create_pbuffer) { HDC hdc_parent = GetDC(win_handle); int iPixelFormat = 0; @@ -144,9 +146,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar int nAttribs = 0; unsigned int nFormats; -#define PUSH1(att) attribs[nAttribs++] = (att); -#define PUSH2(att,value) attribs[nAttribs++] = (att); attribs[nAttribs++] = (value); - /* Retrieve the specifications for the pixelformat from the backbuffer / stencilbuffer */ getColorBits(target->resource.format, &red, &green, &blue, &alphaBits, &colorBits); getDepthStencilBits(StencilBufferFormat, &depthBits, &stencilBits); @@ -158,9 +157,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar PUSH2(WGL_STENCIL_BITS_ARB, stencilBits); PUSH1(0); /* end the list */ -#undef PUSH1 -#undef PUSH2 - /* Try to find a pixelformat that matches exactly. If that fails let ChoosePixelFormat try to find a close match */ if(!GL_EXTCALL(wglChoosePixelFormatARB(hdc_parent, (const int*)&attribs, NULL, 1, &iPixelFormat, &nFormats))) { @@ -205,10 +201,12 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } else { PIXELFORMATDESCRIPTOR pfd; int iPixelFormat; - short red, green, blue, alpha; - short colorBits; - short depthBits, stencilBits; + short redBits, greenBits, blueBits, alphaBits, colorBits; + short depthBits=0, stencilBits=0; int res; + int attribs[256]; + int nAttribs = 0; + unsigned int nFormats; hdc = GetDC(win_handle); if(hdc == NULL) { @@ -217,36 +215,56 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } /* PixelFormat selection */ - /* TODO: fill cColorBits/cDepthBits with target->resource.format */ - ZeroMemory(&pfd, sizeof(pfd)); - pfd.nSize = sizeof(pfd); - pfd.nVersion = 1; - pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ - pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cColorBits = 32; - pfd.cDepthBits = 0; - pfd.cStencilBits = 0; - pfd.iLayerType = PFD_MAIN_PLANE; - - /* Try to match the colorBits of the d3d format */ - if(getColorBits(target->resource.format, &red, &green, &blue, &alpha, &colorBits)) - pfd.cColorBits = colorBits; + PUSH2(WGL_DRAW_TO_WINDOW_ARB, GL_TRUE); /* We want to draw to a window */ + PUSH2(WGL_DOUBLE_BUFFER_ARB, GL_TRUE); + PUSH2(WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB); /* Make sure we don't get a float or color index format */ + + if(!getColorBits(target->resource.format, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) { + ERR("Unable to get color bits for format %#x!\n", target->resource.format); + return FALSE; + } + PUSH2(WGL_COLOR_BITS_ARB, colorBits); + PUSH2(WGL_RED_BITS_ARB, redBits); + PUSH2(WGL_GREEN_BITS_ARB, greenBits); + PUSH2(WGL_BLUE_BITS_ARB, blueBits); + PUSH2(WGL_ALPHA_BITS_ARB, alphaBits); /* Retrieve the depth stencil format from the present parameters. * The choice of the proper format can give a nice performance boost * in case of GPU limited programs. */ if(pPresentParms->EnableAutoDepthStencil) { TRACE("pPresentParms->EnableAutoDepthStencil=enabled; using AutoDepthStencilFormat=%s\n", debug_d3dformat(pPresentParms->AutoDepthStencilFormat)); - if(getDepthStencilBits(pPresentParms->AutoDepthStencilFormat, &depthBits, &stencilBits)) { - pfd.cDepthBits = depthBits; - pfd.cStencilBits = stencilBits; + if(!getDepthStencilBits(pPresentParms->AutoDepthStencilFormat, &depthBits, &stencilBits)) { + ERR("Unable to get depth / stencil bits for AutoDepthStencilFormat %#x!\n", pPresentParms->AutoDepthStencilFormat); + return FALSE; } + PUSH2(WGL_DEPTH_BITS_ARB, depthBits); + PUSH2(WGL_STENCIL_BITS_ARB, stencilBits); } + PUSH1(0); /* end the list */ iPixelFormat = ChoosePixelFormat(hdc, &pfd); - if(!iPixelFormat) { - /* If this happens something is very wrong as ChoosePixelFormat barely fails */ - ERR("Can't find a suitable iPixelFormat\n"); + + /* In case of failure hope that standard ChooosePixelFormat will find something suitable */ + if(!GL_EXTCALL(wglChoosePixelFormatARB(hdc, (const int*)&attribs, NULL, 1, &iPixelFormat, &nFormats))) + { + /* PixelFormat selection */ + ZeroMemory(&pfd, sizeof(pfd)); + pfd.nSize = sizeof(pfd); + pfd.nVersion = 1; + pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ + pfd.iPixelType = PFD_TYPE_RGBA; + pfd.cAlphaBits = alphaBits; + pfd.cColorBits = colorBits; + pfd.cDepthBits = depthBits; + pfd.cStencilBits = stencilBits; + pfd.iLayerType = PFD_MAIN_PLANE; + + iPixelFormat = ChoosePixelFormat(hdc, &pfd); + if(!iPixelFormat) { + /* If this happens something is very wrong as ChoosePixelFormat barely fails */ + ERR("Can't find a suitable iPixelFormat\n"); + } } DescribePixelFormat(hdc, iPixelFormat, sizeof(pfd), &pfd); @@ -265,6 +283,8 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } } } +#undef PUSH1 +#undef PUSH2 ctx = pwglCreateContext(hdc); if(This->numContexts) pwglShareLists(This->contexts[0]->glCtx, ctx);

1 0

Hwang YunSong(황윤성) : wordpad: Updated Korean resource.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 108d86be77cee0f9aeabed7d11f89cab6f5fd933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108d86be77cee0f9aeabed7d1… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Aug 24 16:48:30 2007 +0900 wordpad: Updated Korean resource. --- programs/wordpad/Ko.rc | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 1868800..5f82c82 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -41,8 +41,8 @@ BEGIN MENUITEM "��(&C)\tDEL", ID_EDIT_CLEAR MENUITEM "�� (&S)\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Find . . .\tCrtl+F", ID_FIND - MENUITEM "Find &next\tF3", ID_FIND_NEXT + MENUITEM "ã��(&F). . .\tCrtl+F", ID_FIND + MENUITEM "�� ã��(&N)\tF3", ID_FIND_NEXT MENUITEM SEPARATOR MENUITEM "�б� ��(&O)", ID_EDIT_READONLY MENUITEM "�� (&M)", ID_EDIT_MODIFIED @@ -68,7 +68,7 @@ BEGIN END POPUP "��(&O)" BEGIN - MENUITEM "B&ullet points" ID_BULLET + MENUITEM " �� (&U)" ID_BULLET POPUP "��(&B)" BEGIN MENUITEM "�ý��(&S)\tCtrl+1", ID_BACK_1 @@ -96,20 +96,20 @@ END IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "New" +CAPTION "�� " FONT 10, "MS Sans Serif" BEGIN - LTEXT "New document type",0,3,2,100,15 + LTEXT "�� ",0,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT - PUSHBUTTON "&OK",IDOK,97,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,97,26,40,12 + PUSHBUTTON "Ȯ��(&O)",IDOK,97,12,40,12 + PUSHBUTTON "��(&C)",IDCANCEL,97,26,40,12 END STRINGTABLE DISCARDABLE BEGIN STRING_RICHTEXT_FILES_RTF, "��ġ �ؽ�Ʈ �� (*.rtf)" STRING_TEXT_FILES_TXT, "�ؽ�Ʈ �� (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "��ڵ� �ؽ�Ʈ ��(*.txt)" STRING_ALL_FILES, "�� (*.*)" END @@ -117,9 +117,9 @@ STRINGTABLE DISCARDABLE BEGIN STRING_DEFAULT_FILENAME, "��" STRING_PROMPT_SAVE_CHANGES, "'%s'�� ٲ� �� ϰڽ��ϱ�?" - STRING_SEARCH_FINISHED, "Finished searching the document." - STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." - STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, " \ - "which will cause all formatting to be lost. " \ - "Are you sure that you wish to do this?" + STRING_SEARCH_FINISHED, "�� ã�� ." + STRING_LOAD_RICHED_FAILED, "��ġ�ؽ�Ʈ ��̺귯�� ҷ�� ." + STRING_SAVE_LOSEFORMATTING, "�� ؽ�Ʈ �� ϱ⸦ ��߽��ϴ�, " \ + "�̰�� Ư�� ٹ�� Դϴ�. " \ + "�� ϱ⸦ ��մϱ�?" END

1 0

Hwang YunSong(황윤성) : gphoto2.ds: Updated Korean resource.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: baf21f428b6f591a00f0582484441bf702ac1d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf21f428b6f591a00f058248… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Aug 24 16:49:17 2007 +0900 gphoto2.ds: Updated Korean resource. --- dlls/gphoto2.ds/gphoto2_Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Ko.rc b/dlls/gphoto2.ds/gphoto2_Ko.rc index daaf24c..e1b5945 100644 --- a/dlls/gphoto2.ds/gphoto2_Ko.rc +++ b/dlls/gphoto2.ds/gphoto2_Ko.rc @@ -2,7 +2,7 @@ * Korean resources for Twain * * Copyright 2006 CodeWeavers, Aric Stewart - * Copyright 2006 YunSong Hwang + * Copyright 2006,2007 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,9 +31,9 @@ BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 DEFPUSHBUTTON "��õ� �� ҷ��",IDC_IMPORT,152,252,72,14 - PUSHBUTTON "Preview",IDC_FETCH,7,252,64,14 + PUSHBUTTON " �̸� ��",IDC_FETCH,7,252,64,14 PUSHBUTTON "�� ҷ��",IDC_IMPORTALL,80,252,64,14 - CONTROL "Skip This Dialog",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + CONTROL "��ȭ�� ġ��",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 PUSHBUTTON "��",IDC_EXIT,315,252,50,14 END

1 0

Stefan Leichter : msxml3: Remove 'recursive registry key delete' function.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 5987d3a37b9004378df0fd261d455e068e383d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5987d3a37b9004378df0fd261… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Aug 24 19:51:42 2007 +0200 msxml3: Remove 'recursive registry key delete' function. --- dlls/msxml3/regsvr.c | 76 ++++---------------------------------------------- 1 files changed, 6 insertions(+), 70 deletions(-) diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index 24514df..9a0d938 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -135,9 +135,6 @@ static LONG register_key_defvalueW(HKEY base, WCHAR const *name, WCHAR const *value); static LONG register_key_defvalueA(HKEY base, WCHAR const *name, char const *value); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -226,7 +223,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -347,7 +345,8 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } @@ -403,7 +402,8 @@ static HRESULT unregister_progids(struct progid const *list) LONG res = ERROR_SUCCESS; for (; res == ERROR_SUCCESS && list->name; ++list) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->name); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->name); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; @@ -461,70 +461,6 @@ static LONG register_key_defvalueA( } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Paul Vriens : setupapi/tests: Use skip instead of trace.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 86e2d1a5e76fd4f61c3c17310f4d37c88f2738d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e2d1a5e76fd4f61c3c17310… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 24 16:41:47 2007 +0200 setupapi/tests: Use skip instead of trace. --- dlls/setupapi/tests/devinst.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 6232105..409e6e3 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -130,10 +130,10 @@ START_TEST(devinst) if (pSetupDiCreateDeviceInfoListExW && pSetupDiDestroyDeviceInfoList) test_SetupDiCreateDeviceInfoListEx(); else - trace("Needed calls for SetupDiCreateDeviceInfoListEx not all available, skipping test.\n"); + skip("SetupDiCreateDeviceInfoListExW and/or SetupDiDestroyDeviceInfoList not available\n"); if (pSetupDiOpenClassRegKeyExA) test_SetupDiOpenClassRegKeyExA(); else - trace("Needed call for SetupDiOpenClassRegKeyExA not available, skipping test.\n"); + skip("SetupDiOpenClassRegKeyExA is not available\n"); }

1 0

Paul Vriens : advapi32/tests: Don't use locale dependent string for testing .
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: c213c2c2abbcf628cc6b14bd2c42cd5157b212cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c213c2c2abbcf628cc6b14bd2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Aug 26 16:30:49 2007 +0200 advapi32/tests: Don't use locale dependent string for testing. --- dlls/advapi32/tests/security.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 25df835..9756ca8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1406,8 +1406,10 @@ static void test_LookupAccountName(void) ok(ret, "Failed to lookup account name\n"); todo_wine { - ok(!lstrcmp(account, "BUILTIN"), "Expected BUILTIN, got %s\n", account); - ok(!lstrcmp(domain, "BUILTIN"), "Expected BUILTIN, got %s\n", domain); + /* Using a fixed string will not work on different locales */ + ok(!lstrcmp(account, domain), + "Got %s for account and %s for domain, these should be the same\n", + account, domain); ok(sid_use == SidTypeDomain, "Expected SidTypeDomain, got %d\n", SidTypeDomain); }

1 0

Chris Robinson : wined3d: Only use one fake context when building adapter info.
by Alexandre Julliard 27 Aug '07

27 Aug '07

Module: wine Branch: master Commit: 95b615540877d4e8d7a469abc81f734e7c60ea1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=95b615540877d4e8d7a469abc… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Aug 24 10:16:30 2007 -0700 wined3d: Only use one fake context when building adapter info. --- dlls/wined3d/directx.c | 170 +++++++++++++++++++++++++---------------------- 1 files changed, 90 insertions(+), 80 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 01e6138..29d54ee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -403,40 +403,6 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { BOOL return_value = TRUE; int i; HDC hdc; - HMODULE mod_gl; - -#ifdef USE_WIN32_OPENGL -#define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(mod_gl, #pfn); - mod_gl = LoadLibraryA("opengl32.dll"); - if(!mod_gl) { - ERR("Can't load opengl32.dll!\n"); - return FALSE; - } -#else -#define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn); - /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 (glXGetProcAddress wrapper) instead of opengl32's */ - mod_gl = GetModuleHandleA("gdi32.dll"); -#endif - -/* Load WGL core functions from opengl32.dll */ -#define USE_WGL_FUNC(pfn) p##pfn = (void*)GetProcAddress(mod_gl, #pfn); - WGL_FUNCS_GEN; -#undef USE_WGL_FUNC - - if(!pwglGetProcAddress) { - ERR("Unable to load wglGetProcAddress!\n"); - return FALSE; - } - -/* Dynamicly load all GL core functions */ - GL_FUNCS_GEN; -#undef USE_GL_FUNC - - /* Make sure that we've got a context */ - /* TODO: CreateFakeGLContext should really take a display as a parameter */ - /* Only save the values obtained when a display is provided */ - if (!WineD3D_CreateFakeGLContext() || wined3d_fake_gl_context_foreign) - return_value = FALSE; TRACE_(d3d_caps)("(%p)\n", gl_info); @@ -850,12 +816,21 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx. */ if(WINE_D3D9_CAPABLE(gl_info) && (gl_info->vs_nv_version == VS_VERSION_30)) { - if (strstr(gl_info->gl_renderer, "7800") || - strstr(gl_info->gl_renderer, "7900") || - strstr(gl_info->gl_renderer, "7950") || - strstr(gl_info->gl_renderer, "Quadro FX 4") || - strstr(gl_info->gl_renderer, "Quadro FX 5")) - gl_info->gl_card = CARD_NVIDIA_GEFORCE_7800GT; + if (strstr(gl_info->gl_renderer, "8800")) + gl_info->gl_card = CARD_NVIDIA_GEFORCE_8800GTS; + else if(strstr(gl_info->gl_renderer, "8600") || + strstr(gl_info->gl_renderer, "8700")) + gl_info->gl_card = CARD_NVIDIA_GEFORCE_8600GT; + else if(strstr(gl_info->gl_renderer, "8300") || + strstr(gl_info->gl_renderer, "8400") || + strstr(gl_info->gl_renderer, "8500")) + gl_info->gl_card = CARD_NVIDIA_GEFORCE_8300GS; + else if(strstr(gl_info->gl_renderer, "7800") || + strstr(gl_info->gl_renderer, "7900") || + strstr(gl_info->gl_renderer, "7950") || + strstr(gl_info->gl_renderer, "Quadro FX 4") || + strstr(gl_info->gl_renderer, "Quadro FX 5")) + gl_info->gl_card = CARD_NVIDIA_GEFORCE_7800GT; else if(strstr(gl_info->gl_renderer, "6800") || strstr(gl_info->gl_renderer, "7600")) gl_info->gl_card = CARD_NVIDIA_GEFORCE_6800; @@ -1043,8 +1018,6 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } } - - WineD3D_ReleaseFakeGLContext(); return return_value; } #undef GLINFO_LOCATION @@ -2489,6 +2462,7 @@ ULONG WINAPI D3DCB_DefaultDestroyVolume(IWineD3DVolume *pVolume) { #define PUSH1(att) attribs[nAttribs++] = (att); #define GLINFO_LOCATION (Adapters[0].gl_info) BOOL InitAdapters(void) { + static HMODULE mod_gl; BOOL ret; int ps_selected_mode, vs_selected_mode; @@ -2498,8 +2472,44 @@ BOOL InitAdapters(void) { if(numAdapters > 0) return TRUE; TRACE("Initializing adapters\n"); + + if(!mod_gl) { +#ifdef USE_WIN32_OPENGL +#define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(mod_gl, #pfn); + mod_gl = LoadLibraryA("opengl32.dll"); + if(!mod_gl) { + ERR("Can't load opengl32.dll!\n"); + return FALSE; + } +#else +#define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn); + /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 (glXGetProcAddress wrapper) instead of opengl32's */ + mod_gl = GetModuleHandleA("gdi32.dll"); +#endif + } + +/* Load WGL core functions from opengl32.dll */ +#define USE_WGL_FUNC(pfn) p##pfn = (void*)GetProcAddress(mod_gl, #pfn); + WGL_FUNCS_GEN; +#undef USE_WGL_FUNC + + if(!pwglGetProcAddress) { + ERR("Unable to load wglGetProcAddress!\n"); + return FALSE; + } + +/* Dynamicly load all GL core functions */ + GL_FUNCS_GEN; +#undef USE_GL_FUNC + /* For now only one default adapter */ { + int iPixelFormat; + int attribs[8]; + int values[8]; + int nAttribs = 0; + int res; + WineD3D_PixelFormat *cfgs; int attribute; DISPLAY_DEVICEW DisplayDevice; @@ -2507,16 +2517,25 @@ BOOL InitAdapters(void) { Adapters[0].monitorPoint.x = -1; Adapters[0].monitorPoint.y = -1; + if (!WineD3D_CreateFakeGLContext()) { + ERR("Failed to get a gl context for default adapter\n"); + HeapFree(GetProcessHeap(), 0, Adapters); + WineD3D_ReleaseFakeGLContext(); + return FALSE; + } + ret = IWineD3DImpl_FillGLCaps(&Adapters[0].gl_info); if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); HeapFree(GetProcessHeap(), 0, Adapters); + WineD3D_ReleaseFakeGLContext(); return FALSE; } ret = initPixelFormats(&Adapters[0].gl_info); if(!ret) { ERR("Failed to init gl formats\n"); HeapFree(GetProcessHeap(), 0, Adapters); + WineD3D_ReleaseFakeGLContext(); return FALSE; } @@ -2529,46 +2548,37 @@ BOOL InitAdapters(void) { TRACE("DeviceName: %s\n", debugstr_w(DisplayDevice.DeviceName)); strcpyW(Adapters[0].DeviceName, DisplayDevice.DeviceName); - if (WineD3D_CreateFakeGLContext()) { - int iPixelFormat; - int attribs[8]; - int values[8]; - int nAttribs = 0; - int res; - WineD3D_PixelFormat *cfgs; - - attribute = WGL_NUMBER_PIXEL_FORMATS_ARB; - GL_EXTCALL(wglGetPixelFormatAttribivARB(wined3d_fake_gl_context_hdc, 0, 0, 1, &attribute, &Adapters[0].nCfgs)); - - Adapters[0].cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Adapters[0].nCfgs *sizeof(WineD3D_PixelFormat)); - cfgs = Adapters[0].cfgs; - PUSH1(WGL_RED_BITS_ARB) - PUSH1(WGL_GREEN_BITS_ARB) - PUSH1(WGL_BLUE_BITS_ARB) - PUSH1(WGL_ALPHA_BITS_ARB) - PUSH1(WGL_DEPTH_BITS_ARB) - PUSH1(WGL_STENCIL_BITS_ARB) - - for(iPixelFormat=1; iPixelFormat<=Adapters[0].nCfgs; iPixelFormat++) { - res = GL_EXTCALL(wglGetPixelFormatAttribivARB(wined3d_fake_gl_context_hdc, iPixelFormat, 0, nAttribs, attribs, values)); - - if(!res) - continue; + attribute = WGL_NUMBER_PIXEL_FORMATS_ARB; + GL_EXTCALL(wglGetPixelFormatAttribivARB(wined3d_fake_gl_context_hdc, 0, 0, 1, &attribute, &Adapters[0].nCfgs)); - /* Cache the pixel format */ - cfgs->iPixelFormat = iPixelFormat; - cfgs->redSize = values[0]; - cfgs->greenSize = values[1]; - cfgs->blueSize = values[2]; - cfgs->alphaSize = values[3]; - cfgs->depthSize = values[4]; - cfgs->stencilSize = values[5]; - - TRACE("iPixelFormat=%d, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d\n", cfgs->iPixelFormat, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize); - cfgs++; - } - WineD3D_ReleaseFakeGLContext(); + Adapters[0].cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Adapters[0].nCfgs *sizeof(WineD3D_PixelFormat)); + cfgs = Adapters[0].cfgs; + PUSH1(WGL_RED_BITS_ARB) + PUSH1(WGL_GREEN_BITS_ARB) + PUSH1(WGL_BLUE_BITS_ARB) + PUSH1(WGL_ALPHA_BITS_ARB) + PUSH1(WGL_DEPTH_BITS_ARB) + PUSH1(WGL_STENCIL_BITS_ARB) + + for(iPixelFormat=1; iPixelFormat<=Adapters[0].nCfgs; iPixelFormat++) { + res = GL_EXTCALL(wglGetPixelFormatAttribivARB(wined3d_fake_gl_context_hdc, iPixelFormat, 0, nAttribs, attribs, values)); + + if(!res) + continue; + + /* Cache the pixel format */ + cfgs->iPixelFormat = iPixelFormat; + cfgs->redSize = values[0]; + cfgs->greenSize = values[1]; + cfgs->blueSize = values[2]; + cfgs->alphaSize = values[3]; + cfgs->depthSize = values[4]; + cfgs->stencilSize = values[5]; + + TRACE("iPixelFormat=%d, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d\n", cfgs->iPixelFormat, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize); + cfgs++; } + WineD3D_ReleaseFakeGLContext(); select_shader_mode(&Adapters[0].gl_info, WINED3DDEVTYPE_HAL, &ps_selected_mode, &vs_selected_mode); select_shader_max_constants(ps_selected_mode, vs_selected_mode, &Adapters[0].gl_info);

1 0

appdb/ ./objectManager.php include/bugs.php in ...
by WineHQ 27 Aug '07

27 Aug '07

ChangeSet ID: 31353 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/26 22:48:44 Modified files: . : objectManager.php include : bugs.php maintainer.php sidebar_admin.php util.php version.php unit_test : test_om_objects.php Removed files: admin : adminBugs.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add object manager support to the bug class. Add menu entries for displaying the bug queue and list of bugs and remove the existing link to admin/adminBugs.php. Remove now unused admin/adminBugs.php. Remove now unused getNumberOfQueuedBugLinks() and getNumberOfBugLinks() from util.php. Add object manager unit test support for the bug class. Patch: http://cvs.winehq.org/patch.py?id=31353 Old revision New revision Changes Path 1.18 1.19 +1 -0 appdb/objectManager.php 1.18 Removed +0 -0 appdb/admin/adminBugs.php 1.29 1.30 +225 -34 appdb/include/bugs.php 1.55 1.56 +2 -0 appdb/include/maintainer.php 1.45 1.46 +6 -2 appdb/include/sidebar_admin.php 1.103 1.104 +0 -24 appdb/include/util.php 1.148 1.149 +1 -0 appdb/include/version.php 1.23 1.24 +25 -4 appdb/unit_test/test_om_objects.php

1 0

appdb/include distribution.php
by WineHQ 27 Aug '07

27 Aug '07

ChangeSet ID: 31352 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/26 22:46:03 Modified files: include : distribution.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Skip deleting a distributions test results if there are no test results for the distribution Patch: http://cvs.winehq.org/patch.py?id=31352 Old revision New revision Changes Path 1.44 1.45 +6 -3 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.44 appdb/include/distribution.php:1.45 --- appdb/include/distribution.php:1.44 27 Aug 2007 3:46: 3 -0000 +++ appdb/include/distribution.php 27 Aug 2007 3:46: 3 -0000 @@ -157,10 +157,13 @@ class distribution { return FALSE; // delete any test results this distribution has - foreach($this->aTestingIds as $iTestId) + if($this->aTestingIds) { - $oTestData = new TestData($iTestId); - $oTestData->delete(); + foreach($this->aTestingIds as $iTestId) + { + $oTestData = new TestData($iTestId); + $oTestData->delete(); + } } // now delete the Distribution

1 0

appdb/include objectManager.php
by WineHQ 25 Aug '07

25 Aug '07

ChangeSet ID: 31351 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/25 11:01:58 Modified files: include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add missing div close tag to multipage control Patch: http://cvs.winehq.org/patch.py?id=31351 Old revision New revision Changes Path 1.49 1.50 +1 -0 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.49 appdb/include/objectManager.php:1.50 --- appdb/include/objectManager.php:1.49 25 Aug 2007 16: 1:58 -0000 +++ appdb/include/objectManager.php 25 Aug 2007 16: 1:58 -0000 @@ -760,6 +760,7 @@ class ObjectManager $this->makeUrl()."&iItemsPerPage=$iItemsPerPage"); echo $sControls; + echo "</div>\n"; /* Fill the MultiPage object with the LIMIT related values */ $iLowerLimit = ($iPage - 1) * $iItemsPerPage;

1 0