wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Alexandre Julliard : comctl32: Don' t bother to unregister classes at process exit.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 1b4c1ab900b8d640a208fd83810eee44e306f7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4c1ab900b8d640a208fd838… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:13:04 2013 +0200 comctl32: Don't bother to unregister classes at process exit. --- dlls/comctl32/commctrl.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index c0d0043..f08288d 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -157,7 +157,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: - /* clean up subclassing */ + if (lpvReserved) break; + /* clean up subclassing */ THEMING_Uninitialize(); /* unregister all common control classes */ @@ -185,14 +186,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /* delete local pattern brush */ DeleteObject (COMCTL32_hPattern55AABrush); - COMCTL32_hPattern55AABrush = NULL; DeleteObject (COMCTL32_hPattern55AABitmap); - COMCTL32_hPattern55AABitmap = NULL; /* delete global subclassing atom */ GlobalDeleteAtom (LOWORD(COMCTL32_wSubclass)); TRACE("Subclassing atom deleted: %p\n", COMCTL32_wSubclass); - COMCTL32_wSubclass = NULL; break; }

1 0

Nikolay Sivov : comctl32: Use selected image for listbox/ editbox for selected item only.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 4625c399c6d4127196d3578a7b27ef68bcd417af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4625c399c6d4127196d3578a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 10:48:13 2013 +0400 comctl32: Use selected image for listbox/editbox for selected item only. --- dlls/comctl32/comboex.c | 34 ++++++++++++++-------------------- 1 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 0f3ed4a..cc6115a 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1316,7 +1316,7 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *di UINT xbase, x, y; INT len; COLORREF nbkc, ntxc, bkc, txc; - int drawimage, drawstate, xioff; + int drawimage, drawstate, xioff, selected; TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", dis->CtlType, dis->CtlID); @@ -1417,36 +1417,30 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *di drawimage = -2; drawstate = ILD_NORMAL; + selected = infoPtr->selected == dis->itemID; + if (item->mask & CBEIF_IMAGE) drawimage = item->iImage; + if (item->mask & CBEIF_SELECTEDIMAGE && selected) + drawimage = item->iSelectedImage; if (dis->itemState & ODS_COMBOEXLBOX) { /* drawing listbox entry */ - if (dis->itemState & ODS_SELECTED) { - if (item->mask & CBEIF_SELECTEDIMAGE) - drawimage = item->iSelectedImage; + if (dis->itemState & ODS_SELECTED) drawstate = ILD_SELECTED; - } } else { /* drawing combo/edit entry */ if (IsWindowVisible(infoPtr->hwndEdit)) { /* if we have an edit control, the slave the * selection state to the Edit focus state */ - if (infoPtr->flags & WCBE_EDITFOCUSED) { - if (item->mask & CBEIF_SELECTEDIMAGE) - drawimage = item->iSelectedImage; + if (infoPtr->flags & WCBE_EDITFOCUSED) drawstate = ILD_SELECTED; - } - } else { + } else /* if we don't have an edit control, use * the requested state. */ - if (dis->itemState & ODS_SELECTED) { - if (item->mask & CBEIF_SELECTEDIMAGE) - drawimage = item->iSelectedImage; + if (dis->itemState & ODS_SELECTED) drawstate = ILD_SELECTED; - } - } } if (infoPtr->himl && !(infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGEINDENT)) { @@ -1469,17 +1463,17 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *di if (drawimage == I_IMAGECALLBACK) { NMCOMBOBOXEXW nmce; ZeroMemory(&nmce, sizeof(nmce)); - nmce.ceItem.mask = (drawstate == ILD_NORMAL) ? CBEIF_IMAGE : CBEIF_SELECTEDIMAGE; + nmce.ceItem.mask = selected ? CBEIF_SELECTEDIMAGE : CBEIF_IMAGE; nmce.ceItem.lParam = item->lParam; nmce.ceItem.iItem = dis->itemID; COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce); - if (drawstate == ILD_NORMAL) { + if (!selected) { if (nmce.ceItem.mask & CBEIF_DI_SETITEM) item->iImage = nmce.ceItem.iImage; drawimage = nmce.ceItem.iImage; - } else if (drawstate == ILD_SELECTED) { + } else { if (nmce.ceItem.mask & CBEIF_DI_SETITEM) item->iSelectedImage = nmce.ceItem.iSelectedImage; - drawimage = nmce.ceItem.iSelectedImage; - } else ERR("Bad draw state = %d\n", drawstate); + drawimage = nmce.ceItem.iSelectedImage; + } } if (overlay == I_IMAGECALLBACK) {

1 0

Nikolay Sivov : comctl32: Allocate edit data with control info.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 97caa729b6a883d5ef4f73812f7e0ae207a24810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97caa729b6a883d5ef4f73812… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 09:56:46 2013 +0400 comctl32: Allocate edit data with control info. --- dlls/comctl32/comboex.c | 53 +++++++++++++++++----------------------------- 1 files changed, 20 insertions(+), 33 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index d92da3d..0f3ed4a 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -75,7 +75,7 @@ typedef struct INT nb_items; /* Number of items */ BOOL unicode; /* TRUE if this window is Unicode */ BOOL NtfUnicode; /* TRUE if parent wants notify in Unicode */ - CBE_ITEMDATA *edit; /* item data for edit item */ + CBE_ITEMDATA edit; /* item data for edit item */ CBE_ITEMDATA *items; /* Array of items */ } COMBOEX_INFO; @@ -273,9 +273,9 @@ static void COMBOEX_NotifyDragBegin(const COMBOEX_INFO *infoPtr, LPCWSTR wstr) static void COMBOEX_FreeText (CBE_ITEMDATA *item) { if (is_textW(item->pszText)) Free(item->pszText); - item->pszText = 0; + item->pszText = NULL; Free(item->pszTemp); - item->pszTemp = 0; + item->pszTemp = NULL; } @@ -455,15 +455,15 @@ static void COMBOEX_SetEditText (const COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item } -static CBE_ITEMDATA * COMBOEX_FindItem(const COMBOEX_INFO *infoPtr, INT_PTR index) +static CBE_ITEMDATA *COMBOEX_FindItem(COMBOEX_INFO *infoPtr, INT_PTR index) { CBE_ITEMDATA *item; INT i; if ((index >= infoPtr->nb_items) || (index < -1)) - return 0; + return NULL; if (index == -1) - return infoPtr->edit; + return &infoPtr->edit; item = infoPtr->items; i = infoPtr->nb_items - 1; @@ -481,7 +481,7 @@ static CBE_ITEMDATA * COMBOEX_FindItem(const COMBOEX_INFO *infoPtr, INT_PTR inde /* *** CBEM_xxx message support *** */ -static UINT COMBOEX_GetListboxText(const COMBOEX_INFO *infoPtr, INT_PTR n, LPWSTR buf) +static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, INT_PTR n, LPWSTR buf) { CBE_ITEMDATA *item; LPCWSTR str; @@ -519,7 +519,7 @@ static UINT COMBOEX_GetListboxText(const COMBOEX_INFO *infoPtr, INT_PTR n, LPWST } -static INT COMBOEX_DeleteItem (const COMBOEX_INFO *infoPtr, INT_PTR index) +static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT_PTR index) { TRACE("(index=%ld)\n", index); @@ -534,7 +534,7 @@ static INT COMBOEX_DeleteItem (const COMBOEX_INFO *infoPtr, INT_PTR index) } -static BOOL COMBOEX_GetItemW (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) +static BOOL COMBOEX_GetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) { INT_PTR index = cit->iItem; CBE_ITEMDATA *item; @@ -555,7 +555,7 @@ static BOOL COMBOEX_GetItemW (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) } -static BOOL COMBOEX_GetItemA (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) +static BOOL COMBOEX_GetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) { COMBOBOXEXITEMW tmpcit; @@ -754,7 +754,7 @@ static HIMAGELIST COMBOEX_SetImageList (COMBOEX_INFO *infoPtr, HIMAGELIST himl) return himlTemp; } -static BOOL COMBOEX_SetItemW (const COMBOEX_INFO *infoPtr, const COMBOBOXEXITEMW *cit) +static BOOL COMBOEX_SetItemW (COMBOEX_INFO *infoPtr, const COMBOBOXEXITEMW *cit) { INT_PTR index = cit->iItem; CBE_ITEMDATA *item; @@ -805,7 +805,7 @@ static BOOL COMBOEX_SetItemW (const COMBOEX_INFO *infoPtr, const COMBOBOXEXITEMW return TRUE; } -static BOOL COMBOEX_SetItemA (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA const *cit) +static BOOL COMBOEX_SetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA const *cit) { COMBOBOXEXITEMW citW; LPWSTR wstr = NULL; @@ -863,7 +863,7 @@ COMBOEX_FindStringExact (const COMBOEX_INFO *infoPtr, INT start, LPCWSTR str) } -static DWORD_PTR COMBOEX_GetItemData (const COMBOEX_INFO *infoPtr, INT_PTR index) +static DWORD_PTR COMBOEX_GetItemData (COMBOEX_INFO *infoPtr, INT_PTR index) { CBE_ITEMDATA const *item1; CBE_ITEMDATA const *item2; @@ -903,7 +903,7 @@ static INT COMBOEX_SetCursel (COMBOEX_INFO *infoPtr, INT_PTR index) } -static DWORD_PTR COMBOEX_SetItemData (const COMBOEX_INFO *infoPtr, INT_PTR index, DWORD_PTR data) +static DWORD_PTR COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT_PTR index, DWORD_PTR data) { CBE_ITEMDATA *item1; CBE_ITEMDATA const *item2; @@ -1090,16 +1090,6 @@ static LRESULT COMBOEX_Create (HWND hwnd, CREATESTRUCTA const *cs) COMBOEX_AdjustEditPos (infoPtr); - /* - * Create an item structure to represent the data in the - * EDIT control. It is allocated zero-filled. - */ - infoPtr->edit = Alloc (sizeof (CBE_ITEMDATA)); - if (!infoPtr->edit) { - COMBOEX_Destroy(infoPtr); - return -1; - } - return 0; } @@ -1316,10 +1306,10 @@ static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT const } -static LRESULT COMBOEX_DrawItem (const COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *dis) +static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *dis) { static const WCHAR nil[] = { 0 }; - CBE_ITEMDATA *item = 0; + CBE_ITEMDATA *item = NULL; SIZE txtsize; RECT rect; LPCWSTR str = nil; @@ -1378,7 +1368,7 @@ static LRESULT COMBOEX_DrawItem (const COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT con /* If draw item is -1 (edit control) setup the item pointer */ if (dis->itemID == 0xffffffff) { - item = infoPtr->edit; + item = &infoPtr->edit; if (infoPtr->hwndEdit) { /* free previous text of edit item */ @@ -1576,10 +1566,7 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) if (infoPtr->hwndEdit) RemoveWindowSubclass(infoPtr->hwndEdit, COMBOEX_EditWndProc, EDIT_SUBCLASSID); - COMBOEX_FreeText (infoPtr->edit); - Free (infoPtr->edit); - infoPtr->edit = 0; - + COMBOEX_FreeText (&infoPtr->edit); COMBOEX_ResetContent (infoPtr); if (infoPtr->defaultFont) @@ -1850,7 +1837,7 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) { /* abort the change, restore previous */ TRACE("Notify requested abort of change\n"); - COMBOEX_SetEditText (infoPtr, infoPtr->edit); + COMBOEX_SetEditText (infoPtr, &infoPtr->edit); RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | RDW_INVALIDATE); return 0; @@ -2084,7 +2071,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, GetWindowTextW (infoPtr->hwndEdit, edit_text, 260); if (selected == -1) { - lastwrk = infoPtr->edit->pszText; + lastwrk = infoPtr->edit.pszText; } else { CBE_ITEMDATA *item = COMBOEX_FindItem (infoPtr, selected);

1 0

André Hentschel : po: Fix typo in German translation.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: a3a1913373a730287298f74abef941bb41ff9ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a1913373a730287298f74ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 13 19:37:01 2013 +0200 po: Fix typo in German translation. --- po/de.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/de.po b/po/de.po index 8b28f26..7728925 100644 --- a/po/de.po +++ b/po/de.po @@ -10502,7 +10502,7 @@ msgstr "Unbekannte Protokolle" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "TCP-Statisktik für IPv4" +msgstr "TCP-Statistik für IPv4" #: netstat.rc:42 msgid "Active Opens"

1 0

Huw Davies : user32/tests: Add tests to show that WM_CHAR W<-> A mapping uses the codepage associated with the current keyboard layout.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: d3fec2ce9c5d0b7ae42f4cc85736fdfd8db4bab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3fec2ce9c5d0b7ae42f4cc85… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 13 12:28:43 2013 +0100 user32/tests: Add tests to show that WM_CHAR W<->A mapping uses the codepage associated with the current keyboard layout. --- dlls/user32/tests/msg.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d88dc7e..3a857e8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11900,6 +11900,93 @@ static void test_dbcs_wm_char(void) DestroyWindow(hwnd2); } +static void test_unicode_wm_char(void) +{ + HWND hwnd; + MSG msg; + struct message seq[2]; + HKL hkl_orig, hkl_greek; + DWORD cp; + LCID thread_locale; + + hkl_orig = GetKeyboardLayout( 0 ); + GetLocaleInfoW( LOWORD( hkl_orig ), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR*)&cp, sizeof(cp) / sizeof(WCHAR) ); + if (cp != 1252) + { + skip( "Default codepage %d\n", cp ); + return; + } + + hkl_greek = LoadKeyboardLayout( "00000408", 0 ); + if (!hkl_greek || hkl_greek == hkl_orig /* win2k */) + { + skip( "Unable to load Greek keyboard layout\n" ); + return; + } + + hwnd = CreateWindowExW( 0, testWindowClassW, NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL ); + flush_sequence(); + + PostMessageW( hwnd, WM_CHAR, 0x3b1, 0 ); + + ok( GetMessageW( &msg, hwnd, 0, 0 ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == 0x3b1, "bad wparam %lx\n", msg.wParam ); + ok( msg.lParam == 0, "bad lparam %lx\n", msg.lParam ); + + DispatchMessageW( &msg ); + + memset( seq, 0, sizeof(seq) ); + seq[0].message = WM_CHAR; + seq[0].flags = sent|wparam; + seq[0].wParam = 0x3b1; + + ok_sequence( seq, "unicode WM_CHAR", FALSE ); + + flush_sequence(); + + /* greek alpha -> 'a' in cp1252 */ + PostMessageW( hwnd, WM_CHAR, 0x3b1, 0 ); + + ok( GetMessageA( &msg, hwnd, 0, 0 ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == 0x61, "bad wparam %lx\n", msg.wParam ); + ok( msg.lParam == 0, "bad lparam %lx\n", msg.lParam ); + + DispatchMessageA( &msg ); + + seq[0].wParam = 0x61; + ok_sequence( seq, "unicode WM_CHAR", FALSE ); + + thread_locale = GetThreadLocale(); + ActivateKeyboardLayout( hkl_greek, 0 ); + ok( GetThreadLocale() == thread_locale, "locale changed from %08x to %08x\n", + thread_locale, GetThreadLocale() ); + + flush_sequence(); + + /* greek alpha -> 0xe1 in cp1253 */ + PostMessageW( hwnd, WM_CHAR, 0x3b1, 0 ); + + ok( GetMessageA( &msg, hwnd, 0, 0 ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == 0xe1, "bad wparam %lx\n", msg.wParam ); + ok( msg.lParam == 0, "bad lparam %lx\n", msg.lParam ); + + DispatchMessageA( &msg ); + + seq[0].wParam = 0x3b1; + ok_sequence( seq, "unicode WM_CHAR", FALSE ); + + DestroyWindow( hwnd ); + ActivateKeyboardLayout( hkl_orig, 0 ); + UnloadKeyboardLayout( hkl_greek ); +} + #define ID_LISTBOX 0x000f static const struct message wm_lb_setcursel_0[] = @@ -14124,6 +14211,7 @@ START_TEST(msg) test_EndDialog(); test_nullCallback(); test_dbcs_wm_char(); + test_unicode_wm_char(); test_menu_messages(); test_paintingloop(); test_defwinproc();

1 0

Jacek Caban : ole32: Error handling clean up in local_server_thread.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: b4cc5a2114592a5e336ba353688f04db6da0bdfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4cc5a2114592a5e336ba3536… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 12:31:31 2013 +0200 ole32: Error handling clean up in local_server_thread. --- dlls/ole32/rpc.c | 26 +++++++------------------- 1 files changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 5070117..6259380 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1917,16 +1917,12 @@ static DWORD WINAPI local_server_thread(LPVOID param) DWORD ret; ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); if (ret != WAIT_OBJECT_0) - { - CloseHandle(hPipe); break; - } } /* client already connected isn't an error */ else if (error != ERROR_PIPE_CONNECTED) { ERR("ConnectNamedPipe failed with error %d\n", GetLastError()); - CloseHandle(hPipe); break; } } @@ -1935,20 +1931,14 @@ static DWORD WINAPI local_server_thread(LPVOID param) hres = IStream_Stat(pStm,&ststg,STATFLAG_NONAME); if (hres) - { - CloseHandle(hPipe); - CloseHandle(pipe_event); - return hres; - } + break; seekto.u.LowPart = 0; seekto.u.HighPart = 0; hres = IStream_Seek(pStm,seekto,STREAM_SEEK_SET,&newpos); if (hres) { FIXME("IStream_Seek failed, %x\n",hres); - CloseHandle(hPipe); - CloseHandle(pipe_event); - return hres; + break; } buflen = ststg.cbSize.u.LowPart; @@ -1957,10 +1947,8 @@ static DWORD WINAPI local_server_thread(LPVOID param) hres = IStream_Read(pStm,buffer,buflen,&res); if (hres) { FIXME("Stream Read failed, %x\n",hres); - CloseHandle(hPipe); - CloseHandle(pipe_event); HeapFree(GetProcessHeap(),0,buffer); - return hres; + break; } WriteFile(hPipe,buffer,buflen,&res,&ovl); @@ -1974,22 +1962,22 @@ static DWORD WINAPI local_server_thread(LPVOID param) if (!multi_use) { TRACE("single use object, shutting down pipe %s\n", debugstr_w(pipefn)); - CloseHandle(hPipe); break; } new_pipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, 4096, 4096, 500 /* 0.5 second timeout */, NULL ); - CloseHandle(hPipe); if (new_pipe == INVALID_HANDLE_VALUE) { FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); - CloseHandle(pipe_event); - return 1; + break; } + CloseHandle(hPipe); hPipe = new_pipe; } + CloseHandle(pipe_event); + CloseHandle(hPipe); return 0; }

1 0

Stefan Dösinger : wined3d: Pass the pixel shader input signature to shader_arb_generate_vshader.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 260e1cb0b3a980915bcecf8a20b939a43a25ceae URL: http://source.winehq.org/git/wine.git/?a=commit;h=260e1cb0b3a980915bcecf8a2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 12 15:30:24 2013 +0200 wined3d: Pass the pixel shader input signature to shader_arb_generate_vshader. --- dlls/wined3d/arb_program_shader.c | 48 +++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f29252e..6756927 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3954,7 +3954,8 @@ static DWORD find_input_signature(struct shader_arb_priv *priv, const struct win return found_sig->idx; } -static void init_output_registers(const struct wined3d_shader *shader, DWORD sig_num, +static void init_output_registers(const struct wined3d_shader *shader, + const struct wined3d_shader_signature_element *ps_input_sig, struct shader_arb_ctx_priv *priv_ctx, struct arb_vs_compiled_shader *compiled) { unsigned int i, j; @@ -3963,8 +3964,6 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig "result.texcoord[0]", "result.texcoord[1]", "result.texcoord[2]", "result.texcoord[3]", "result.texcoord[4]", "result.texcoord[5]", "result.texcoord[6]", "result.texcoord[7]" }; - struct wined3d_device *device = shader->device; - const struct wined3d_shader_signature_element *sig; const char *semantic_name; DWORD semantic_idx, reg_idx; @@ -3978,7 +3977,7 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig "result.color.primary", "result.color.secondary" }; - if(sig_num == ~0) + if (!ps_input_sig) { TRACE("Pixel shader uses builtin varyings\n"); /* Map builtins to builtins */ @@ -4037,10 +4036,6 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig return; } - /* Instead of searching for the signature in the signature list, read the one from the current pixel shader. - * Its maybe not the shader where the signature came from, but it is the same signature and faster to find - */ - sig = device->stateBlock->state.pixel_shader->input_signature; TRACE("Pixel shader uses declared varyings\n"); /* Map builtin to declared. /dev/null the results by default to the TA temp reg */ @@ -4054,9 +4049,9 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig for(i = 0; i < MAX_REG_INPUT; i++) { - semantic_name = sig[i].semantic_name; - semantic_idx = sig[i].semantic_idx; - reg_idx = sig[i].register_idx; + semantic_name = ps_input_sig[i].semantic_name; + semantic_idx = ps_input_sig[i].semantic_idx; + reg_idx = ps_input_sig[i].register_idx; if (!semantic_name) continue; /* If a declared input register is not written by builtin arguments, don't write to it. @@ -4115,12 +4110,12 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig for(j = 0; j < MAX_REG_INPUT; j++) { - if (!sig[j].semantic_name) continue; + if (!ps_input_sig[j].semantic_name) continue; - if (!strcmp(sig[j].semantic_name, semantic_name) - && sig[j].semantic_idx == shader->output_signature[i].semantic_idx) + if (!strcmp(ps_input_sig[j].semantic_name, semantic_name) + && ps_input_sig[j].semantic_idx == shader->output_signature[i].semantic_idx) { - priv_ctx->vs_output[i] = decl_idx_to_string[sig[j].register_idx]; + priv_ctx->vs_output[i] = decl_idx_to_string[ps_input_sig[j].register_idx]; if (!strcmp(priv_ctx->vs_output[i], "result.color.primary") || !strcmp(priv_ctx->vs_output[i], "result.color.secondary")) @@ -4135,7 +4130,8 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig /* Context activation is done by the caller. */ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, struct wined3d_shader_buffer *buffer, - const struct arb_vs_compile_args *args, struct arb_vs_compiled_shader *compiled) + const struct arb_vs_compile_args *args, struct arb_vs_compiled_shader *compiled, + const struct wined3d_shader_signature_element *ps_input_sig) { const struct arb_vshader_private *shader_data = shader->backend_data; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; @@ -4150,7 +4146,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args; list_init(&priv_ctx.control_frames); - init_output_registers(shader, args->ps_signature, &priv_ctx, compiled); + init_output_registers(shader, ps_input_sig, &priv_ctx, compiled); /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); @@ -4387,7 +4383,8 @@ static inline BOOL vs_args_equal(const struct arb_vs_compile_args *stored, const } static struct arb_vs_compiled_shader *find_arb_vshader(struct wined3d_shader *shader, - const struct arb_vs_compile_args *args) + const struct arb_vs_compile_args *args, + const struct wined3d_shader_signature_element *ps_input_sig) { struct wined3d_device *device = shader->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; @@ -4465,7 +4462,8 @@ static struct arb_vs_compiled_shader *find_arb_vshader(struct wined3d_shader *sh } ret = shader_arb_generate_vshader(shader, gl_info, &buffer, args, - &shader_data->gl_shaders[shader_data->num_gl_shaders]); + &shader_data->gl_shaders[shader_data->num_gl_shaders], + ps_input_sig); shader_buffer_free(&buffer); shader_data->gl_shaders[shader_data->num_gl_shaders].prgId = ret; @@ -4688,10 +4686,20 @@ static void shader_arb_select(const struct wined3d_context *context, enum wined3 struct wined3d_shader *vs = state->vertex_shader; struct arb_vs_compile_args compile_args; struct arb_vs_compiled_shader *compiled; + const struct wined3d_shader_signature_element *ps_input_sig; TRACE("Using vertex shader %p\n", vs); find_arb_vs_compile_args(state, context, vs, &compile_args); - compiled = find_arb_vshader(vs, &compile_args); + + /* Instead of searching for the signature in the signature list, read the one from the + * current pixel shader. It's maybe not the shader where the signature came from, but it + * is the same signature and faster to find. */ + if (compile_args.ps_signature == ~0U) + ps_input_sig = NULL; + else + ps_input_sig = state->pixel_shader->input_signature; + + compiled = find_arb_vshader(vs, &compile_args, ps_input_sig); priv->current_vprogram_id = compiled->prgId; priv->compiled_vprog = compiled;

1 0

Stefan Dösinger : wined3d: Fix a ~0U assignment.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: e25b96849976574c3ff295efbf3784e0244b2350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25b96849976574c3ff295efb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 12 15:30:23 2013 +0200 wined3d: Fix a ~0U assignment. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7cd73a2..f29252e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4311,7 +4311,7 @@ static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_shader *sh shader_data->clamp_consts = shader->reg_maps.shader_version.major == 1; if (shader->reg_maps.shader_version.major < 3) - shader_data->input_signature_idx = ~0; + shader_data->input_signature_idx = ~0U; else shader_data->input_signature_idx = find_input_signature(priv, shader->input_signature);

1 0

Hans Leidekker : winhttp: Fix a memory leak.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 93637828b4b07708cbcebc0aadf5f8a44b3b9121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93637828b4b07708cbcebc0aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 13 12:17:36 2013 +0200 winhttp: Fix a memory leak. Reported by Marcus Meissner. --- dlls/winhttp/request.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3238aa5..436a02f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1582,6 +1582,8 @@ static BOOL do_authorization( request_t *request, DWORD target, DWORD scheme_fla { ERR("authentication scheme changed from %s to %s\n", debugstr_w(auth_schemes[authinfo->scheme].str), debugstr_w(auth_value)); + destroy_authinfo( authinfo ); + *auth_ptr = NULL; return FALSE; } in.BufferType = SECBUFFER_TOKEN;

1 0

Alistair Leslie-Hughes : oledb32: Implement GetConversionSize DBTYPE_VARIANT->DBTYPE_WSTR.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: d72787521e09d1ce8287b8b2175412586488d07d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72787521e09d1ce8287b8b21… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 13 12:29:22 2013 +1000 oledb32: Implement GetConversionSize DBTYPE_VARIANT->DBTYPE_WSTR. --- dlls/oledb32/convert.c | 14 ++++++++++++++ dlls/oledb32/tests/convert.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 3d7d23d..65a2bf6 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1113,6 +1113,20 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, { switch (src_type) { + case DBTYPE_VARIANT: + { + VARIANT v; + + VariantInit(&v); + if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + { + *dst_len = (SysStringLen(V_BSTR(&v)) + 1) * sizeof(WCHAR); + VariantClear(&v); + } + else + return hr; + } + break; case DBTYPE_STR: if(src_len) *dst_len = (*src_len + 1) * sizeof(WCHAR); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 7f3e3ee..64562b1 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2339,6 +2339,7 @@ static void test_getconversionsize(void) BSTR str; static WCHAR strW[] = {'t','e','s','t',0}; static char strTest[] = "test"; + VARIANT var; /* same way as CanConvert fails here */ dst_len = 0; @@ -2394,6 +2395,33 @@ static void test_getconversionsize(void) hr = IDataConvert_GetConversionSize(convert, DBTYPE_STR, DBTYPE_WSTR, &src_len, &dst_len, strTest); ok(hr == S_OK, "got 0x%08x\n", hr); ok(dst_len == 42, "%ld\n", dst_len); + + dst_len = 0; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, NULL, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 10, "%ld\n", dst_len); + VariantClear(&var); + + dst_len = 0; + src_len = 20; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 10, "%ld\n", dst_len); + VariantClear(&var); + + dst_len = 0; + src_len = 20; + V_VT(&var) = VT_I4; + V_I4(&var) = 4; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(dst_len == 110, "%ld\n", dst_len); + VariantClear(&var); + } static void test_converttovar(void)

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2013