May 2010 - Wine-commits - list.winehq.org

André Hentschel : wineusr: Fake dlls are no problem anymore.
by Alexandre Julliard 05 May '10

05 May '10

Module: docs Branch: master Commit: 784fb625246d0ac5377759e0101ac204344326e4 URL: http://source.winehq.org/git/docs.git/?a=commit;h=784fb625246d0ac5377759e01… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 4 20:47:08 2010 +0200 wineusr: Fake dlls are no problem anymore. --- en/wineusr-configuring.sgml | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index e556bd3..37a7cef 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -181,16 +181,6 @@ </sect3> <sect3> <title>Notes About System DLL's</title> - <para> - The Wine team has determined that it is necessary to create fake DLL - files to trick many programs that check for file existence to - determine whether a particular feature (such as Winsock and its - TCP/IP networking) is available. If this is a problem for you, you - can create empty files in the configured c:\windows\system32 directory - to make the program think it's there, and Wine's built-in DLL will - be loaded when the program actually asks for it. (Unfortunately, - tools/wineinstall does not create such empty files itself.) - </para> <para> Applications sometimes also try to inspect the version resources from the physical files (for example, to determine the DirectX

1 0

Andrew Nguyen : rundll32: Recognize entry points passed as ordinal numbers.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: a42c072830dfd552559d2a9002c55965c42809fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42c072830dfd552559d2a900… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue May 4 07:46:20 2010 -0500 rundll32: Recognize entry points passed as ordinal numbers. --- programs/rundll32/rundll32.c | 48 +++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 17 deletions(-) diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index e8ac8a5..c619693 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -119,30 +119,44 @@ static FARPROC16 get_entry_point16( HINSTANCE16 inst, LPCWSTR entry ) static void *get_entry_point32( HMODULE module, LPCWSTR entry, BOOL *unicode ) { void *ret; - DWORD len = WideCharToMultiByte( CP_ACP, 0, entry, -1, NULL, 0, NULL, NULL ); - char *entryA = HeapAlloc( GetProcessHeap(), 0, len + 1 ); - - if (!entryA) - return NULL; - WideCharToMultiByte( CP_ACP, 0, entry, -1, entryA, len, NULL, NULL ); + /* determine if the entry point is an ordinal */ + if (entry[0] == '#') + { + int ordinal = atoiW( entry + 1 ); + if (ordinal <= 0) + return NULL; - /* first try the W version */ - *unicode = TRUE; - strcat( entryA, "W" ); - if (!(ret = GetProcAddress( module, entryA ))) + *unicode = TRUE; + ret = GetProcAddress( module, (LPCSTR)ordinal ); + } + else { - /* now the A version */ - *unicode = FALSE; - entryA[strlen(entryA)-1] = 'A'; + DWORD len = WideCharToMultiByte( CP_ACP, 0, entry, -1, NULL, 0, NULL, NULL ); + char *entryA = HeapAlloc( GetProcessHeap(), 0, len + 1 ); + + if (!entryA) + return NULL; + + WideCharToMultiByte( CP_ACP, 0, entry, -1, entryA, len, NULL, NULL ); + + /* first try the W version */ + *unicode = TRUE; + strcat( entryA, "W" ); if (!(ret = GetProcAddress( module, entryA ))) { - /* now the version without suffix */ - entryA[strlen(entryA)-1] = 0; - ret = GetProcAddress( module, entryA ); + /* now the A version */ + *unicode = FALSE; + entryA[strlen(entryA)-1] = 'A'; + if (!(ret = GetProcAddress( module, entryA ))) + { + /* now the version without suffix */ + entryA[strlen(entryA)-1] = 0; + ret = GetProcAddress( module, entryA ); + } } + HeapFree( GetProcessHeap(), 0, entryA ); } - HeapFree( GetProcessHeap(), 0, entryA ); return ret; }

1 0

Sven Baars : appwiz.cpl: Fix Dutch translation.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 262869ce86d1bf6e814dea8f18cf684f09d27865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=262869ce86d1bf6e814dea8f1… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue May 4 16:56:12 2010 +0200 appwiz.cpl: Fix Dutch translation. --- dlls/appwiz.cpl/Nl.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/Nl.rc b/dlls/appwiz.cpl/Nl.rc index 7a16931..f86325d 100644 --- a/dlls/appwiz.cpl/Nl.rc +++ b/dlls/appwiz.cpl/Nl.rc @@ -28,7 +28,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE { IDS_CPL_TITLE, "Software" - IDS_CPL_DESC, "Hiermee installeert u nieuwe software, of verwijderd u bestaande software van uw computer." + IDS_CPL_DESC, "Hiermee installeert u nieuwe software, of verwijdert u bestaande software van uw computer." IDS_TAB1_TITLE, "Programma's" IDS_UNINSTALL_FAILED, "Het programma '%s' kan niet verwijderd worden van het systeem. Wilt u het verwijderen uit het register?" @@ -48,11 +48,11 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Installeren/Verwijderen" FONT 8, "MS Shell Dlg" { - CONTROL "Om een programma te installeren vanaf een floppy disk, CD-ROM drive, of uw hard disk, klik op Installeren.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "Om een programma te installeren vanaf een diskette, CD-ROM, of uw harde schijf, klik op Installeren.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "&Installeren...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "De volgende software kan automatisch verwijderd worden. Om het programma te verwijderen of de geïnstalleerde onderdelen te wijzigen, selecteer het in de lijst en druk op Wijzigen/Verwijderen.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "De volgende software kan automatisch verwijderd worden. Om een programma te verwijderen of de geïnstalleerde onderdelen te wijzigen, selecteer het in de lijst en druk op Wijzigen/Verwijderen.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Support Informatie...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 78, 198, 76, 14 CONTROL "&Wijzigen...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 158, 198, 68, 14 @@ -72,8 +72,8 @@ FONT 8, "MS Shell Dlg" CONTROL "Contact:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 CONTROL "Support Informatie:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 CONTROL "Support Telefoon:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 - CONTROL "Lees me:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 - CONTROL "Produkt Updates:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Lees mij:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Product Updates:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 CONTROL "Commentaar:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8

1 0

Gerald Pfeifer : mshtml: Fix return value for HTMLBodyElement_get_text.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 6976400f7b523956d389aef644663454387bc767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6976400f7b523956d389aef64… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 16:19:05 2010 +0200 mshtml: Fix return value for HTMLBodyElement_get_text. --- dlls/mshtml/htmlbody.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 5c66e65..e4bb1d0 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -462,7 +462,7 @@ static HRESULT WINAPI HTMLBodyElement_get_text(IHTMLBodyElement *iface, VARIANT nsAString_Finish(&text); - return S_OK; + return hres; } static HRESULT WINAPI HTMLBodyElement_put_link(IHTMLBodyElement *iface, VARIANT v)

1 0

Alexandre Goujon : winex11: Use XkbKeycodeToKeysym when using XKB.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: a30b94651d9f01b4bfa9afd073b7e02861e52f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30b94651d9f01b4bfa9afd07… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Thu Apr 29 22:22:35 2010 +0200 winex11: Use XkbKeycodeToKeysym when using XKB. --- dlls/winex11.drv/keyboard.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 46925f7..893796f 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1107,6 +1107,14 @@ static const WORD xfree86_vendor_key_vkey[256] = 0, 0, 0, 0, 0, 0, 0, 0 /* 1008FFF8 */ }; +static inline KeySym keycode_to_keysym( Display *display, KeyCode keycode, int index ) +{ +#ifdef HAVE_XKB + if (use_xkb) return XkbKeycodeToKeysym(display, keycode, 0, index); +#endif + return XKeycodeToKeysym(display, keycode, index); +} + /* Returns the Windows virtual key code associated with the X event <e> */ /* x11 lock must be held */ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) @@ -1505,7 +1513,7 @@ X11DRV_KEYBOARD_DetectLayout( Display *display ) for (keyc = min_keycode; keyc <= max_keycode; keyc++) { /* get data for keycode from X server */ for (i = 0; i < syms; i++) { - if (!(keysym = XKeycodeToKeysym (display, keyc, i))) continue; + if (!(keysym = keycode_to_keysym (display, keyc, i))) continue; /* Allow both one-byte and two-byte national keysyms */ if ((keysym < 0x8000) && (keysym != ' ')) { @@ -1717,12 +1725,12 @@ void X11DRV_InitKeyboard( Display *display ) int k; for (k = 0; k < keysyms_per_keycode; k += 1) - if (XKeycodeToKeysym(display, *kcp, k) == XK_Num_Lock) + if (keycode_to_keysym(display, *kcp, k) == XK_Num_Lock) { NumLockMask = 1 << i; TRACE_(key)("NumLockMask is %x\n", NumLockMask); } - else if (XKeycodeToKeysym(display, *kcp, k) == XK_Scroll_Lock) + else if (keycode_to_keysym(display, *kcp, k) == XK_Scroll_Lock) { ScrollLockMask = 1 << i; TRACE_(key)("ScrollLockMask is %x\n", ScrollLockMask); @@ -1774,7 +1782,7 @@ void X11DRV_InitKeyboard( Display *display ) /* we seem to need to search the layout-dependent scancodes */ int maxlen=0,maxval=-1,ok; for (i=0; i<syms; i++) { - keysym = XKeycodeToKeysym(display, keyc, i); + keysym = keycode_to_keysym(display, keyc, i); if ((keysym<0x8000) && (keysym!=' ')) { #ifdef HAVE_XKB @@ -1926,7 +1934,7 @@ void X11DRV_InitKeyboard( Display *display ) for (scan = 0x60, keyc = min_keycode; keyc <= max_keycode; keyc++) if (keyc2vkey[keyc]&&!keyc2scan[keyc]) { const char *ksname; - keysym = XKeycodeToKeysym(display, keyc, 0); + keysym = keycode_to_keysym(display, keyc, 0); ksname = XKeysymToString(keysym); if (!ksname) ksname = "NoSymbol"; @@ -2130,7 +2138,7 @@ SHORT CDECL X11DRV_VkKeyScanEx(WCHAR wChar, HKL hkl) wine_tsx11_lock(); for (i = 0; i < 4; i++) /* find shift state */ { - if (XKeycodeToKeysym(display, keycode, i) == keysym) + if (keycode_to_keysym(display, keycode, i) == keysym) { index = i; break; @@ -2384,7 +2392,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) { wine_tsx11_lock(); keyc = (KeyCode) keyi; - keys = XKeycodeToKeysym(display, keyc, 0); + keys = keycode_to_keysym(display, keyc, 0); name = XKeysymToString(keys); wine_tsx11_unlock(); TRACE("found scan=%04x keyc=%u keysym=%04x string=%s\n",

1 0

Gerald Pfeifer : user32/tests: Destroy the window we created at the end of wait_idle_thread.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 7ef088b680d3db3c9b2f468ac1d7e561cc4a5638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ef088b680d3db3c9b2f468ac… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 22:19:08 2010 +0200 user32/tests: Destroy the window we created at the end of wait_idle_thread. --- dlls/user32/tests/msg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 714e57f..1b4a3cb 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12275,6 +12275,7 @@ static DWORD CALLBACK wait_idle_thread( void *arg ) hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL); while (GetMessage( &msg, 0, 0, 0 )) DispatchMessage( &msg ); + DestroyWindow(hwnd); return 0; }

1 0

Gerald Pfeifer : wineconsole: Remove variable font_idx which is not really used from WCUSER_FontPreviewProc .
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: e86c6799a0efd47d422baee7e5725630ba9bb38a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86c6799a0efd47d422baee7e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 22:24:07 2010 +0200 wineconsole: Remove variable font_idx which is not really used from WCUSER_FontPreviewProc. --- programs/wineconsole/dialog.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 622595d..cb3ff50 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -173,7 +173,6 @@ static LRESULT WINAPI WCUSER_FontPreviewProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_PAINT: { PAINTSTRUCT ps; - int font_idx; int size_idx; struct dialog_info* di; HFONT hFont, hOldFont; @@ -181,7 +180,6 @@ static LRESULT WINAPI WCUSER_FontPreviewProc(HWND hWnd, UINT msg, WPARAM wParam, di = (struct dialog_info*)GetWindowLongPtrW(GetParent(hWnd), DWLP_USER); BeginPaint(hWnd, &ps); - font_idx = SendDlgItemMessageW(di->hDlg, IDC_FNT_LIST_FONT, LB_GETCURSEL, 0, 0); size_idx = SendDlgItemMessageW(di->hDlg, IDC_FNT_LIST_SIZE, LB_GETCURSEL, 0, 0); hFont = (HFONT)GetWindowLongPtrW(hWnd, 0);

1 0

Gerald Pfeifer : user32/tests: Remove variable old_left_margin which is not really used from test_margins .
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 9da2bbfab75189f20153459a81538d61c7dcb160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da2bbfab75189f20153459a8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 22:09:48 2010 +0200 user32/tests: Remove variable old_left_margin which is not really used from test_margins. --- dlls/user32/tests/edit.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9dd6fac..fb74143 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1381,13 +1381,12 @@ static void test_margins(void) { HWND hwEdit; RECT old_rect, new_rect; - INT old_left_margin, old_right_margin; + INT old_right_margin; DWORD old_margins, new_margins; hwEdit = create_editcontrol(WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); old_margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); - old_left_margin = LOWORD(old_margins); old_right_margin = HIWORD(old_margins); /* Check if setting the margins works */

1 0

Maarten Lankhorst : mmdevapi: Add support for openal disconnected extension .
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 38517694bb81b23601a5f67cba42184afec25db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38517694bb81b23601a5f67cb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 4 13:30:40 2010 +0200 mmdevapi: Add support for openal disconnected extension. --- dlls/mmdevapi/audio.c | 172 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 142 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38517694bb81b23601a5f…

1 0

Damjan Jovanovic : mshta: wWinMain takes LPWSTR not LPSTR.
by Alexandre Julliard 04 May '10

04 May '10

Module: wine Branch: master Commit: 2de301d4f4b8a636c1e6415db8628b33f41bb68f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de301d4f4b8a636c1e6415db… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 4 19:14:17 2010 +0200 mshta: wWinMain takes LPWSTR not LPSTR. --- programs/mshta/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/mshta/main.c b/programs/mshta/main.c index 53baa7e..a0287a7 100644 --- a/programs/mshta/main.c +++ b/programs/mshta/main.c @@ -22,7 +22,7 @@ #include <stdio.h> #include <windows.h> -int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) +int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { printf("mshta.exe is a stub!\n"); return 0;

1 0