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

Ben Hodgetts : winecfg: Clean up Graphics tab and remove broken neutral translation.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: b2d25de6f78854ab79e5b3b21cc2cbfd75c4cc77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d25de6f78854ab79e5b3b21… Author: Ben Hodgetts <ben(a)atomnet.co.uk> Date: Tue Jul 3 16:12:08 2007 +0100 winecfg: Clean up Graphics tab and remove broken neutral translation. --- programs/winecfg/En.rc | 95 +++++++++--------------------------------------- 1 files changed, 17 insertions(+), 78 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 02d4850..5972c3b 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -62,29 +62,29 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Window settings ",IDC_STATIC,8,4,244,180 + GROUPBOX " Window Settings ",IDC_STATIC,8,4,244,184 - CONTROL "Allow DirectX apps to stop the mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,230,8 - LTEXT "If windows are managed by your window manager, then they will have the standard borders, they will respect your virtual desktop and appear in your window list. \n\nIf the windows are unmanaged, they will be disconnected from your window manager. This will mean the windows do not integrate as closely with your desktop, but the emulation will be more accurate so it can help some programs to work better.", - IDC_STATIC,15,37,228,80 - CONTROL "Allow the window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,230,8 + CONTROL "Allow DirectX apps to stop the mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 - LTEXT "You can either choose to have all Windows applications confined to a single window acting as a virtual desktop, or to have them behave like your other applications.", - IDC_STATIC,15,125,228,28 - LTEXT "Desktop size:",IDC_DESKTOP_SIZE,15,167,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,167,8,8,WS_DISABLED + CONTROL "Allow the window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 + LTEXT "If windows are managed by your window manager, then they will have the standard borders, they will respect your virtual desktop and appear in your window list. \n\nIf the windows are unmanaged, they will be disconnected from your window manager. This will mean the windows do not integrate as closely with your desktop, but the emulation will be more accurate so it can help some programs to work better.", + IDC_STATIC,19,51,225,80 + CONTROL "Emulate a virtual desktop",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,152,230,10 - - EDITTEXT IDC_DESKTOP_WIDTH,64,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + BS_AUTOCHECKBOX | WS_TABSTOP,15,128,230,10 + LTEXT "You can either choose to have all Windows applications confined to a single window acting as a virtual desktop, or to have them behave like your other applications.", + IDC_STATIC,19,138,225,28 + LTEXT "Desktop size:",IDC_DESKTOP_SIZE,15,168,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,109,168,8,8,WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,189,244,50 + GROUPBOX " Direct3D ",IDC_STATIC,8,195,244,48 - LTEXT "Vertex Shader Support: ",IDC_STATIC,15,199,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,197,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vertex Shader Support: ",IDC_STATIC,15,208,80,32 + COMBOBOX IDC_D3D_VSHADER_MODE,100,206,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,216,230,10 + CONTROL "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,224,230,10 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -305,64 +305,3 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "Inactive Title Bar" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inactive Title Text" END - -/****************************************************************/ -/* English neutral resources -/****************************************************************/ - -LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL -IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 -STYLE WS_CHILD | WS_DISABLED -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX " Window settings ",IDC_STATIC,8,4,244,110 - - CONTROL "Allow DirectX apps to stop the mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,230,8 - CONTROL "Allow the window manager to manage created windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,34,230,8 - - /* FIXME: the wording of this explanation could be a lot better */ - LTEXT "You can choose to emulate a windows desktop, where all the windows are confined to one 'virtual screen', or you can have the windows placed on your standard desktop.", - IDC_STATIC,15,52,228,28 - LTEXT "Desktop size:",IDC_DESKTOP_SIZE,15,94,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,94,8,8,WS_DISABLED - CONTROL "Emulate a virtual desktop",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,79,230,10 - - EDITTEXT IDC_DESKTOP_WIDTH,64,94,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,94,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - - GROUPBOX " Direct3D ",IDC_STATIC,8,119,244,120 - - LTEXT "Vertex Shader Support: ",IDC_STATIC,15,129,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,127,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - CONTROL "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,144,230,10 -END - -IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 -STYLE WS_CHILD | WS_DISABLED -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 - LTEXT "Theme:",IDC_STATIC,15,16,130,8 - COMBOBOX IDC_THEME_THEMECOMBO,15,24,130,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Install theme...",IDC_THEME_INSTALL,152,23,93,14 - LTEXT "Color:",IDC_THEME_COLORTEXT,15,40,112,8 - COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:",IDC_THEME_SIZETEXT,135,40,110,8 - COMBOBOX IDC_THEME_SIZECOMBO,135,48,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Item:",IDC_STATIC,15,64,112,8 - COMBOBOX IDC_SYSPARAM_COMBO,15,74,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Color:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED - PUSHBUTTON "",IDC_SYSPARAM_COLOR,135,74,25,13,WS_DISABLED | BS_OWNERDRAW - LTEXT "Size:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED - EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 - PUSHBUTTON "Font",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED - GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 - CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | - LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 - EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED -END

1 0

Aric Stewart : include: Add a ddk header for imm.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 708de8f633a1305003951d12370e02eafd8578d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708de8f633a1305003951d123… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 3 12:27:29 2007 -0500 include: Add a ddk header for imm. --- include/Makefile.in | 1 + include/ddk/imm.h | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 754df2d..4526036 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -109,6 +109,7 @@ SRCDIR_INCLUDES = \ ddeml.h \ ddk/compstui.h \ ddk/hidsdi.h \ + ddk/imm.h \ ddk/ntddcdvd.h \ ddk/ntddser.h \ ddk/ntddtape.h \ diff --git a/include/ddk/imm.h b/include/ddk/imm.h new file mode 100644 index 0000000..15bf7bc --- /dev/null +++ b/include/ddk/imm.h @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2007 CodeWeavers, Aric Stewart + * + * 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 + */ + +#ifndef _DDKIMM_H_ +#define _DDKIMM_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _tagINPUTCONTEXT { + HWND hWnd; + BOOL fOpen; + POINT ptStatusWndPos; + POINT ptSoftKbdPos; + DWORD fdwConversion; + DWORD fdwSentence; + union { + LOGFONTA A; + LOGFONTW W; + } lfFont; + COMPOSITIONFORM cfCompForm; + CANDIDATEFORM cfCandForm[4]; + HIMCC hCompStr; + HIMCC hCandInfo; + HIMCC hGuideLine; + HIMCC hPrivate; + DWORD dwNumMsgBuf; + HIMCC hMsgBuf; + DWORD fdwInit; + DWORD dwReserve[3]; +} INPUTCONTEXT, *LPINPUTCONTEXT; + +typedef struct _tagIMEINFO { + DWORD dwPrivateDataSize; + DWORD fdwProperty; + DWORD fdwConversionCaps; + DWORD fdwSentenceCaps; + DWORD fdwUICaps; + DWORD fdwSCSCaps; + DWORD fdwSelectCaps; +} IMEINFO, *LPIMEINFO; + +typedef struct tagCOMPOSITIONSTRING { + DWORD dwSize; + DWORD dwCompReadAttrLen; + DWORD dwCompReadAttrOffset; + DWORD dwCompReadClauseLen; + DWORD dwCompReadClauseOffset; + DWORD dwCompReadStrLen; + DWORD dwCompReadStrOffset; + DWORD dwCompAttrLen; + DWORD dwCompAttrOffset; + DWORD dwCompClauseLen; + DWORD dwCompClauseOffset; + DWORD dwCompStrLen; + DWORD dwCompStrOffset; + DWORD dwCursorPos; + DWORD dwDeltaStart; + DWORD dwResultReadClauseLen; + DWORD dwResultReadClauseOffset; + DWORD dwResultReadStrLen; + DWORD dwResultReadStrOffset; + DWORD dwResultClauseLen; + DWORD dwResultClauseOffset; + DWORD dwResultStrLen; + DWORD dwResultStrOffset; + DWORD dwPrivateSize; + DWORD dwPrivateOffset; +} COMPOSITIONSTRING, *LPCOMPOSITIONSTRING; + +LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC); +BOOL WINAPI ImmUnlockIMC(HIMC); +DWORD WINAPI ImmGetIMCLockCount(HIMC); +HIMCC WINAPI ImmCreateIMCC(DWORD); +HIMCC WINAPI ImmDestroyIMCC(HIMCC); +LPVOID WINAPI ImmLockIMCC(HIMCC); +BOOL WINAPI ImmUnlockIMCC(HIMCC); +DWORD WINAPI ImmGetIMCCLockCount(HIMCC); +HIMCC WINAPI ImmReSizeIMCC(HIMCC, DWORD); +DWORD WINAPI ImmGetIMCCSize(HIMCC); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _DDKIMM_H_ */

1 0

Aric Stewart : imm32: Implement Locking/Unlocking IMC and IMCC functions.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 68b9f52bdb6070639d315b62b56cf829078d2a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b9f52bdb6070639d315b62b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 3 12:32:21 2007 -0500 imm32: Implement Locking/Unlocking IMC and IMCC functions. --- dlls/imm32/imm.c | 219 ++++++++++++++++++++++++++++++++++++++----------- dlls/imm32/imm32.spec | 20 ++-- 2 files changed, 182 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68b9f52bdb6070639d315…

1 0

Paul Vriens : advpack/tests: Create the temporary inf-file in a directory where we are allowed to write .
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 618c1fe711193a11f2b36fd75100048ed5b87468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=618c1fe711193a11f2b36fd75… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jul 4 11:32:10 2007 +0200 advpack/tests: Create the temporary inf-file in a directory where we are allowed to write. --- dlls/advpack/tests/advpack.c | 43 ++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index a60d81e..7218b59 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -42,6 +42,7 @@ static HRESULT (WINAPI *pSetPerUserSecValues)(PPERUSERSECTION pPerUser); static HRESULT (WINAPI *pTranslateInfString)(LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,DWORD,LPDWORD,LPVOID); static HRESULT (WINAPI *pTranslateInfStringEx)(HINF,PCSTR,PCSTR,PCSTR,PSTR,DWORD,PDWORD,PVOID); +static CHAR inf_file[MAX_PATH]; static CHAR PROG_FILES[MAX_PATH]; static DWORD PROG_FILES_LEN; @@ -190,7 +191,7 @@ static void create_inf_file(void) char data[1024]; char *ptr = data; DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFile("c:\\test.inf", GENERIC_WRITE, 0, NULL, + HANDLE hf = CreateFile(inf_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); append_str(&ptr, "[Version]\n"); @@ -242,7 +243,7 @@ static void translateinfstring_test(void) /* try a nonexistent section */ buffer[0] = 0; - hr = pTranslateInfString("c:\\test.inf", "idontexist", "Options.NTx86", + hr = pTranslateInfString(inf_file, "idontexist", "Options.NTx86", "InstallDir", buffer, MAX_PATH, &dwSize, NULL); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", (UINT)hr); ok(!strcmp(buffer, TEST_STRING2), "Expected %s, got %s\n", TEST_STRING2, buffer); @@ -250,21 +251,21 @@ static void translateinfstring_test(void) buffer[0] = 0; /* try other nonexistent section */ - hr = pTranslateInfString("c:\\test.inf", "Options.NTx86", "idontexist", + hr = pTranslateInfString(inf_file, "Options.NTx86", "idontexist", "InstallDir", buffer, MAX_PATH, &dwSize, NULL); ok(hr == SPAPI_E_LINE_NOT_FOUND || hr == E_INVALIDARG, "Expected SPAPI_E_LINE_NOT_FOUND or E_INVALIDARG, got 0x%08x\n", (UINT)hr); buffer[0] = 0; /* try nonexistent key */ - hr = pTranslateInfString("c:\\test.inf", "Options.NTx86", "Options.NTx86", + hr = pTranslateInfString(inf_file, "Options.NTx86", "Options.NTx86", "notvalid", buffer, MAX_PATH, &dwSize, NULL); ok(hr == SPAPI_E_LINE_NOT_FOUND || hr == E_INVALIDARG, "Expected SPAPI_E_LINE_NOT_FOUND or E_INVALIDARG, got 0x%08x\n", (UINT)hr); buffer[0] = 0; /* test the behavior of pszInstallSection */ - hr = pTranslateInfString("c:\\test.inf", "section", "Options.NTx86", + hr = pTranslateInfString(inf_file, "section", "Options.NTx86", "InstallDir", buffer, MAX_PATH, &dwSize, NULL); ok(hr == ERROR_SUCCESS || hr == E_FAIL, "Expected ERROR_SUCCESS or E_FAIL, got 0x%08x\n", (UINT)hr); @@ -277,7 +278,7 @@ static void translateinfstring_test(void) buffer[0] = 0; /* try without a pszInstallSection */ - hr = pTranslateInfString("c:\\test.inf", NULL, "Options.NTx86", + hr = pTranslateInfString(inf_file, NULL, "Options.NTx86", "InstallDir", buffer, MAX_PATH, &dwSize, NULL); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", (UINT)hr); todo_wine @@ -287,7 +288,7 @@ static void translateinfstring_test(void) } DeleteFile("c:\\a.inf"); - DeleteFile("c:\\test.inf"); + DeleteFile(inf_file); } static void translateinfstringex_test(void) @@ -311,15 +312,15 @@ static void translateinfstringex_test(void) "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); /* try a NULL hinf */ - hr = pOpenINFEngine("c:\\test.inf", "Options.NTx86", 0, NULL, NULL); + hr = pOpenINFEngine(inf_file, "Options.NTx86", 0, NULL, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* open the INF without the Install section specified */ - hr = pOpenINFEngine("c:\\test.inf", NULL, 0, &hinf, NULL); + hr = pOpenINFEngine(inf_file, NULL, 0, &hinf, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* try a NULL hinf */ - hr = pTranslateInfStringEx(NULL, "c:\\test.inf", "Options.NTx86", "InstallDir", + hr = pTranslateInfStringEx(NULL, inf_file, "Options.NTx86", "InstallDir", buffer, size, &size, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); @@ -342,22 +343,22 @@ static void translateinfstringex_test(void) } /* try a NULL translate section */ - hr = pTranslateInfStringEx(hinf, "c:\\test.inf", NULL, "InstallDir", + hr = pTranslateInfStringEx(hinf, inf_file, NULL, "InstallDir", buffer, size, &size, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* try an empty translate section */ - hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "", "InstallDir", + hr = pTranslateInfStringEx(hinf, inf_file, "", "InstallDir", buffer, size, &size, NULL); ok(hr == SPAPI_E_LINE_NOT_FOUND, "Expected SPAPI_E_LINE_NOT_FOUND, got %08x\n", hr); /* try a NULL translate key */ - hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "Options.NTx86", NULL, + hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", NULL, buffer, size, &size, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* try an empty translate key */ - hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "Options.NTx86", "", + hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "", buffer, size, &size, NULL); ok(hr == SPAPI_E_LINE_NOT_FOUND, "Expected SPAPI_E_LINE_NOT_FOUND, got %08x\n", hr); @@ -365,7 +366,7 @@ static void translateinfstringex_test(void) memset(buffer, 'a', 25); buffer[24] = '\0'; size = MAX_PATH; - hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "Options.NTx86", "InstallDir", + hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "InstallDir", buffer, size, &size, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); todo_wine @@ -383,14 +384,14 @@ static void translateinfstringex_test(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* open the inf with the install section */ - hr = pOpenINFEngine("c:\\test.inf", "section", 0, &hinf, NULL); + hr = pOpenINFEngine(inf_file, "section", 0, &hinf, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* translate the string with the install section specified */ memset(buffer, 'a', PROG_FILES_LEN); buffer[PROG_FILES_LEN - 1] = '\0'; size = MAX_PATH; - hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "Options.NTx86", "InstallDir", + hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "InstallDir", buffer, size, &size, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(!strcmp(buffer, PROG_FILES), "Expected %s, got %s\n", PROG_FILES, buffer); @@ -400,7 +401,7 @@ static void translateinfstringex_test(void) hr = pCloseINFEngine(hinf); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - DeleteFileA("c:\\test.inf"); + DeleteFileA(inf_file); } static BOOL check_reg_str(HKEY hkey, LPCSTR name, LPCSTR value) @@ -518,6 +519,12 @@ START_TEST(advpack) if (!init_function_pointers()) return; + /* Make sure we create the temporary file in a directory + * were we have enough rights + */ + GetTempPath(MAX_PATH, inf_file); + lstrcat(inf_file,"test.inf"); + get_progfiles_dir(); version_test();

1 0

Rob Shearman : secur32: Add tests for multiple use of a credential handle.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 98820d4ef4a97ff36fc086dca9bb4c2a3b6e2faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=98820d4ef4a97ff36fc086dca… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jul 4 11:31:46 2007 +0100 secur32: Add tests for multiple use of a credential handle. --- dlls/secur32/tests/ntlm.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index de6bd7f..435b636 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1196,6 +1196,69 @@ static void testAcquireCredentialsHandle(void) pFreeCredentialsHandle(&cred); } +static void test_cred_multiple_use(void) +{ + static char test_user[] = "testuser", + workgroup[] = "WORKGROUP", + test_pass[] = "testpass", + sec_pkg_name[] = "NTLM"; + SECURITY_STATUS ret; + SEC_WINNT_AUTH_IDENTITY id; + PSecPkgInfo pkg_info = NULL; + CredHandle cred; + CtxtHandle ctxt1; + CtxtHandle ctxt2; + SecBufferDesc buffer_desc; + SecBuffer buffers[1]; + ULONG ctxt_attr; + TimeStamp ttl; + + if(pQuerySecurityPackageInfoA(sec_pkg_name, &pkg_info) != SEC_E_OK) + { + skip("NTLM package not installed, skipping test\n"); + return; + } + buffers[0].cbBuffer = pkg_info->cbMaxToken; + buffers[0].BufferType = SECBUFFER_TOKEN; + buffers[0].pvBuffer = HeapAlloc(GetProcessHeap(), 0, buffers[0].cbBuffer); + + pFreeContextBuffer(pkg_info); + + id.User = (unsigned char*) test_user; + id.UserLength = strlen((char *) id.User); + id.Domain = (unsigned char *) workgroup; + id.DomainLength = strlen((char *) id.Domain); + id.Password = (unsigned char*) test_pass; + id.PasswordLength = strlen((char *) id.Password); + id.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; + + ret = pAcquireCredentialsHandleA(NULL, sec_pkg_name, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + getSecError(ret)); + + buffer_desc.ulVersion = SECBUFFER_VERSION; + buffer_desc.cBuffers = sizeof(buffers)/sizeof(buffers[0]); + buffer_desc.pBuffers = buffers; + + ret = pInitializeSecurityContextA(&cred, NULL, NULL, ISC_REQ_CONNECTION, + 0, SECURITY_NETWORK_DREP, NULL, 0, &ctxt1, &buffer_desc, + &ctxt_attr, &ttl); + ok(ret == SEC_I_CONTINUE_NEEDED, "InitializeSecurityContextA failed with error 0x%x\n", ret); + + ret = pInitializeSecurityContextA(&cred, NULL, NULL, ISC_REQ_CONNECTION, + 0, SECURITY_NETWORK_DREP, NULL, 0, &ctxt2, &buffer_desc, + &ctxt_attr, &ttl); + ok(ret == SEC_I_CONTINUE_NEEDED, "Second InitializeSecurityContextA on cred handle failed with error 0x%x\n", ret); + + ret = pDeleteSecurityContext(&ctxt1); + ok(ret == SEC_E_OK, "DeleteSecurityContext failed with error 0x%x\n", ret); + ret = pDeleteSecurityContext(&ctxt2); + ok(ret == SEC_E_OK, "DeleteSecurityContext failed with error 0x%x\n", ret); + ret = pFreeCredentialsHandle(&cred); + ok(ret == SEC_E_OK, "FreeCredentialsHandle failed with error 0x%x\n", ret); +} + START_TEST(ntlm) { InitFunctionPtrs(); @@ -1217,6 +1280,8 @@ START_TEST(ntlm) if(pMakeSignature && pVerifySignature && pEncryptMessage && pDecryptMessage) testSignSeal(); + + test_cred_multiple_use(); } if(secdll)

1 0

Alexandre Julliard : configure: Merge the libXrender existence check with the soname check.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 629639ee601052907b2b67005fb1fda54314dd08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=629639ee601052907b2b67005… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 4 12:47:57 2007 +0200 configure: Merge the libXrender existence check with the soname check. --- configure | 270 ++++++++++++++++++++++---------------------- configure.ac | 23 ++-- dlls/winex11.drv/xrandr.c | 3 - dlls/winex11.drv/xrender.c | 9 +- 4 files changed, 150 insertions(+), 155 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=629639ee601052907b2b6…

1 0

Alexandre Julliard : configure: Merge the libXinerama existence check with the soname check.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 35d2fd7a255b5c10de9e24b0f25477176b25c4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d2fd7a255b5c10de9e24b0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 4 12:48:50 2007 +0200 configure: Merge the libXinerama existence check with the soname check. --- configure | 155 +++++++++++++++++++++---------------------- configure.ac | 3 +- dlls/winex11.drv/xinerama.c | 10 +-- include/config.h.in | 3 - 4 files changed, 79 insertions(+), 92 deletions(-) diff --git a/configure b/configure index a1e264f..2216e59 100755 --- a/configure +++ b/configure @@ -9633,11 +9633,84 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: checking for -lXinerama" >&5 +echo $ECHO_N "checking for -lXinerama... $ECHO_C" >&6; } +if test "${ac_cv_lib_soname_Xinerama+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lXinerama $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBXINERAMA 1 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XineramaQueryScreens (); +int +main () +{ +return XineramaQueryScreens (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + case "$LIBEXT" in + dll) ;; + dylib) ac_cv_lib_soname_Xinerama=`otool -L conftest$ac_exeext | grep "libXinerama\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libXinerama\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_Xinerama=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXinerama\\.$LIBEXT" | sed -e "s/^.*$libXinerama\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + esac +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if test "x$ac_cv_lib_soname_Xinerama" = "x"; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + +else + { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xinerama" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_Xinerama" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBXINERAMA "$ac_cv_lib_soname_Xinerama" _ACEOF + +fi + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -15262,84 +15335,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for -lXinerama" >&5 -echo $ECHO_N "checking for -lXinerama... $ECHO_C" >&6; } -if test "${ac_cv_lib_soname_Xinerama+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lXinerama $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XineramaQueryScreens (); -int -main () -{ -return XineramaQueryScreens (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - case "$LIBEXT" in - dll) ;; - dylib) ac_cv_lib_soname_Xinerama=`otool -L conftest$ac_exeext | grep "libXinerama\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libXinerama\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_Xinerama=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXinerama\\.$LIBEXT" | sed -e "s/^.*$libXinerama\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; - esac -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if test "x$ac_cv_lib_soname_Xinerama" = "x"; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - -else - { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xinerama" >&5 -echo "${ECHO_T}$ac_cv_lib_soname_Xinerama" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBXINERAMA "$ac_cv_lib_soname_Xinerama" -_ACEOF - - -fi - { echo "$as_me:$LINENO: checking for -lXcursor" >&5 echo $ECHO_N "checking for -lXcursor... $ECHO_C" >&6; } if test "${ac_cv_lib_soname_Xcursor+set}" = set; then diff --git a/configure.ac b/configure.ac index 3e7c97b..7e0b73e 100644 --- a/configure.ac +++ b/configure.ac @@ -558,7 +558,7 @@ then then AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> #include <X11/extensions/Xinerama.h>]], [[static typeof(XineramaQueryScreens) * func;]])], - [AC_DEFINE(HAVE_LIBXINERAMA, 1, [Define if you have the Xinerama library])],[]) + [WINE_CHECK_SONAME(Xinerama,XineramaQueryScreens,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])]) fi dnl *** End of X11/Xlib.h check @@ -1148,7 +1148,6 @@ AC_DEFINE_UNQUOTED(SONAME_EXT,[".$LIBEXT"],[Define to the file extension of shar WINE_CHECK_SONAME(X11,XCreateWindow,,,[$X_LIBS $X_EXTRA_LIBS]) WINE_CHECK_SONAME(Xext,XextCreateExtension,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS]) -WINE_CHECK_SONAME(Xinerama,XineramaQueryScreens,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS]) WINE_CHECK_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index be04c21..75b905a 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -66,17 +66,13 @@ static inline int monitor_to_index( HMONITOR handle ) } -#ifdef HAVE_LIBXINERAMA +#ifdef SONAME_LIBXINERAMA #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(XineramaQueryExtension); MAKE_FUNCPTR(XineramaQueryScreens); -#ifndef SONAME_LIBXINERAMA -#define SONAME_LIBXINERAMA "libXinerama" SONAME_EXT -#endif - static void load_xinerama(void) { void *handle; @@ -129,14 +125,14 @@ static int query_screens(void) return count; } -#else /* HAVE_LIBXINERAMA */ +#else /* SONAME_LIBXINERAMA */ static inline int query_screens(void) { return 0; } -#endif /* HAVE_LIBXINERAMA */ +#endif /* SONAME_LIBXINERAMA */ void xinerama_init(void) { diff --git a/include/config.h.in b/include/config.h.in index 18c17a0..0aed6ea 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -300,9 +300,6 @@ /* Define to 1 if you have the `ossaudio' library (-lossaudio). */ #undef HAVE_LIBOSSAUDIO -/* Define if you have the Xinerama library */ -#undef HAVE_LIBXINERAMA - /* Define if you have the libxml2 library */ #undef HAVE_LIBXML2

1 0

Alexandre Julliard : configure: Get rid of the no longer used check for libtxc_dxtn.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 6a4010294cad9c5f4c99343813801fbfb93bd618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a4010294cad9c5f4c9934381… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 4 12:50:05 2007 +0200 configure: Get rid of the no longer used check for libtxc_dxtn. --- configure | 78 --------------------------------------------------- configure.ac | 1 - include/config.h.in | 3 -- 3 files changed, 0 insertions(+), 82 deletions(-) diff --git a/configure b/configure index 2216e59..47240f5 100755 --- a/configure +++ b/configure @@ -15491,84 +15491,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for -ltxc_dxtn" >&5 -echo $ECHO_N "checking for -ltxc_dxtn... $ECHO_C" >&6; } -if test "${ac_cv_lib_soname_txc_dxtn+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-ltxc_dxtn $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char fetch_2d_texel_rgba_dxt1 (); -int -main () -{ -return fetch_2d_texel_rgba_dxt1 (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - case "$LIBEXT" in - dll) ;; - dylib) ac_cv_lib_soname_txc_dxtn=`otool -L conftest$ac_exeext | grep "libtxc_dxtn\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libtxc_dxtn\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_txc_dxtn=`$ac_cv_path_LDD conftest$ac_exeext | grep "libtxc_dxtn\\.$LIBEXT" | sed -e "s/^.*$libtxc_dxtn\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; - esac -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if test "x$ac_cv_lib_soname_txc_dxtn" = "x"; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - -else - { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_txc_dxtn" >&5 -echo "${ECHO_T}$ac_cv_lib_soname_txc_dxtn" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBTXC_DXTN "$ac_cv_lib_soname_txc_dxtn" -_ACEOF - - -fi - diff --git a/configure.ac b/configure.ac index 7e0b73e..01165a0 100644 --- a/configure.ac +++ b/configure.ac @@ -1150,7 +1150,6 @@ WINE_CHECK_SONAME(Xext,XextCreateExtension,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS]) -WINE_CHECK_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1) dnl **** Check for functions **** diff --git a/include/config.h.in b/include/config.h.in index 0aed6ea..807d365 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1002,9 +1002,6 @@ /* Define to the soname of the libssl library. */ #undef SONAME_LIBSSL -/* Define to the soname of the libtxc_dxtn library. */ -#undef SONAME_LIBTXC_DXTN - /* Define to the soname of the libX11 library. */ #undef SONAME_LIBX11

1 0

Alexandre Julliard : ntdll: Add check for null pointer in NtQuerySystemInformation( SystemModuleInformation).
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 68a6182188e2cf83f9c0647abc5f2446bbe2408d URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a6182188e2cf83f9c0647ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 4 12:07:22 2007 +0200 ntdll: Add check for null pointer in NtQuerySystemInformation(SystemModuleInformation). --- dlls/ntdll/nt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ed707c0..a303dcf 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -845,7 +845,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( break; case SystemModuleInformation: /* FIXME: should be system-wide */ - ret = LdrQueryProcessModuleInformation( SystemInformation, Length, &len ); + if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; + else ret = LdrQueryProcessModuleInformation( SystemInformation, Length, &len ); break; case SystemHandleInformation: {

1 0

Alexandre Julliard : configure: Merge the libGL existence check with the soname check.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 31353e1eddd44e8bb436032913ef101b4e5bb5b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31353e1eddd44e8bb43603291… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 4 12:44:12 2007 +0200 configure: Merge the libGL existence check with the soname check. --- configure | 115 +++++++++--------------------------------- configure.ac | 5 +- dlls/winex11.drv/opengl.c | 11 +--- dlls/winex11.drv/x11ddraw.c | 3 - 4 files changed, 30 insertions(+), 104 deletions(-) diff --git a/configure b/configure index cc67602..1a9fe1b 100755 --- a/configure +++ b/configure @@ -9617,14 +9617,14 @@ echo "${ECHO_T}$wine_cv_opengl_header_version_OK" >&6; } if test "$wine_cv_opengl_header_version_OK" = "yes" then - { echo "$as_me:$LINENO: checking for glXCreateContext in -lGL" >&5 -echo $ECHO_N "checking for glXCreateContext in -lGL... $ECHO_C" >&6; } -if test "${ac_cv_lib_GL_glXCreateContext+set}" = set; then + { echo "$as_me:$LINENO: checking for -lGL" >&5 +echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; } +if test "${ac_cv_lib_soname_GL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS + ac_check_soname_save_LIBS=$LIBS LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9664,22 +9664,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_GL_glXCreateContext=yes + case "$LIBEXT" in + dll) ;; + dylib) ac_cv_lib_soname_GL=`otool -L conftest$ac_exeext | grep "libGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libGL\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest$ac_exeext | grep "libGL\\.$LIBEXT" | sed -e "s/^.*$libGL\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + esac else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_GL_glXCreateContext=no + fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + LIBS=$ac_check_soname_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXCreateContext" >&5 -echo "${ECHO_T}$ac_cv_lib_GL_glXCreateContext" >&6; } -if test $ac_cv_lib_GL_glXCreateContext = yes; then - OPENGL_LIBS="-lGL" +if test "x$ac_cv_lib_soname_GL" = "x"; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + +else + { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_GL" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBGL "$ac_cv_lib_soname_GL" +_ACEOF + + OPENGL_LIBS="-lGL" OPENGLFILES='$(OPENGLFILES)' cat >>confdefs.h <<\_ACEOF @@ -15488,84 +15501,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for -lGL" >&5 -echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; } -if test "${ac_cv_lib_soname_GL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lGL $X_LIBS $X_EXTRA_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char glXQueryExtension (); -int -main () -{ -return glXQueryExtension (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - case "$LIBEXT" in - dll) ;; - dylib) ac_cv_lib_soname_GL=`otool -L conftest$ac_exeext | grep "libGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libGL\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_GL=`$ac_cv_path_LDD conftest$ac_exeext | grep "libGL\\.$LIBEXT" | sed -e "s/^.*$libGL\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; - esac -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if test "x$ac_cv_lib_soname_GL" = "x"; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - -else - { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_GL" >&5 -echo "${ECHO_T}$ac_cv_lib_soname_GL" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBGL "$ac_cv_lib_soname_GL" -_ACEOF - - -fi - { echo "$as_me:$LINENO: checking for -ltxc_dxtn" >&5 echo $ECHO_N "checking for -ltxc_dxtn... $ECHO_C" >&6; } if test "${ac_cv_lib_soname_txc_dxtn+set}" = set; then diff --git a/configure.ac b/configure.ac index f983e8b..637cad9 100644 --- a/configure.ac +++ b/configure.ac @@ -579,12 +579,12 @@ then if test "$wine_cv_opengl_header_version_OK" = "yes" then dnl Check for the presence of the library - AC_CHECK_LIB(GL,glXCreateContext, + WINE_CHECK_SONAME(GL,glXCreateContext, [OPENGL_LIBS="-lGL" OPENGLFILES='$(OPENGLFILES)' AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])] ,, - $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) + [$X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS]) dnl Check for GLU32 library. AC_CHECK_LIB(GLU,gluLookAt, @@ -1151,7 +1151,6 @@ WINE_CHECK_SONAME(Xrender,XRenderQueryExtension,,,[$X_LIBS -lXext -lX11 $X_EXTRA WINE_CHECK_SONAME(Xrandr,XRRQueryExtension,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS]) -WINE_CHECK_SONAME(GL,glXQueryExtension,,,[$X_LIBS $X_EXTRA_LIBS]) WINE_CHECK_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 84c5092..02dfbff 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DECLARE_DEBUG_CHANNEL(opengl); -#if defined(HAVE_GL_GL_H) && defined(HAVE_GL_GLX_H) +#ifdef SONAME_LIBGL #undef APIENTRY #undef CALLBACK @@ -198,13 +198,6 @@ static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { TRACE("\n"); } -/* No need to load any other libraries as according to the ABI, libGL should be self-sufficient and - include all dependencies -*/ -#ifndef SONAME_LIBGL -#define SONAME_LIBGL "libGL" SONAME_EXT -#endif - #define PUSH1(attribs,att) do { attribs[nAttribs++] = (att); } while (0) #define PUSH2(attribs,att,value) do { attribs[nAttribs++] = (att); attribs[nAttribs++] = (value); } while(0) @@ -354,6 +347,8 @@ static BOOL has_opengl(void) if (init_done) return (opengl_handle != NULL); init_done = 1; + /* No need to load any other libraries as according to the ABI, libGL should be self-sufficient + and include all dependencies */ opengl_handle = wine_dlopen(SONAME_LIBGL, RTLD_NOW|RTLD_GLOBAL, NULL, 0); if (opengl_handle == NULL) return FALSE; diff --git a/dlls/winex11.drv/x11ddraw.c b/dlls/winex11.drv/x11ddraw.c index 9b5ed76..e0bda0a 100644 --- a/dlls/winex11.drv/x11ddraw.c +++ b/dlls/winex11.drv/x11ddraw.c @@ -397,9 +397,6 @@ INT X11DRV_DCICommand(INT cbInput, const DCICMD *lpCmd, LPVOID lpOutData) /* FIXME: get x11drv's hInstance */ X11DRV_Settings_CreateDriver(&hal_info); -#ifdef HAVE_OPENGL - /*X11DRV_GLX_CreateDriver(&hal_info);*/ -#endif (ddraw_fns->lpSetInfo)(&hal_info, FALSE); *lpInstance = hal_info.hInstance;

1 0