March 2008 - Wine-commits - list.winehq.org

Alexander Dorofeyev : wined3d: Make device palettes dynamically allocated.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 165970992ae0ce2cd7ee352b48e793b0e93d03fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=165970992ae0ce2cd7ee352b4… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Mar 27 00:23:04 2008 +0200 wined3d: Make device palettes dynamically allocated. --- dlls/wined3d/device.c | 72 ++++++++++++++++++++++++++++++++++++--- dlls/wined3d/stateblock.c | 12 ------- dlls/wined3d/wined3d_private.h | 6 ++-- 3 files changed, 69 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cfef9ac..74d3bf7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2006,6 +2006,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR IWineD3DSwapChainImpl *swapchain = NULL; HRESULT hr; DWORD state; + unsigned int i; TRACE("(%p)->(%p,%p)\n", This, pPresentationParameters, D3DCB_CreateAdditionalSwapChain); if(This->d3d_initialized) return WINED3DERR_INVALIDCALL; @@ -2035,6 +2036,25 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR This->fbo_color_attachments = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface *) * GL_LIMITS(buffers)); This->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLenum) * GL_LIMITS(buffers)); + This->NumberOfPalettes = 1; + This->palettes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PALETTEENTRY*)); + if(!This->palettes || !This->render_targets || !This->fbo_color_attachments || !This->draw_buffers) { + ERR("Out of memory!\n"); + goto err_out; + } + This->palettes[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(PALETTEENTRY) * 256); + if(!This->palettes[0]) { + ERR("Out of memory!\n"); + goto err_out; + } + for (i = 0; i < 256; ++i) { + This->palettes[0][i].peRed = 0xFF; + This->palettes[0][i].peGreen = 0xFF; + This->palettes[0][i].peBlue = 0xFF; + This->palettes[0][i].peFlags = 0xFF; + } + This->currentPalette = 0; + /* Initialize the texture unit mapping to a 1:1 mapping */ for (state = 0; state < MAX_COMBINED_SAMPLERS; ++state) { if (state < GL_LIMITS(fragment_samplers)) { @@ -2157,6 +2177,11 @@ err_out: HeapFree(GetProcessHeap(), 0, This->draw_buffers); HeapFree(GetProcessHeap(), 0, This->swapchains); This->NumberOfSwapChains = 0; + if(This->palettes) { + HeapFree(GetProcessHeap(), 0, This->palettes[0]); + HeapFree(GetProcessHeap(), 0, This->palettes); + } + This->NumberOfPalettes = 0; if(swapchain) { IWineD3DSwapChain_Release( (IWineD3DSwapChain *) swapchain); } @@ -2275,6 +2300,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D This->swapchains = NULL; This->NumberOfSwapChains = 0; + for (i = 0; i < This->NumberOfPalettes; i++) HeapFree(GetProcessHeap(), 0, This->palettes[i]); + HeapFree(GetProcessHeap(), 0, This->palettes); + This->palettes = NULL; + This->NumberOfPalettes = 0; + HeapFree(GetProcessHeap(), 0, This->render_targets); HeapFree(GetProcessHeap(), 0, This->fbo_color_attachments); HeapFree(GetProcessHeap(), 0, This->draw_buffers); @@ -2282,7 +2312,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D This->fbo_color_attachments = NULL; This->draw_buffers = NULL; - This->d3d_initialized = FALSE; return WINED3D_OK; } @@ -5452,11 +5481,38 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ValidateDevice(IWineD3DDevice *iface, static HRESULT WINAPI IWineD3DDeviceImpl_SetPaletteEntries(IWineD3DDevice *iface, UINT PaletteNumber, CONST PALETTEENTRY* pEntries) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; int j; + UINT NewSize; + PALETTEENTRY **palettes; + TRACE("(%p) : PaletteNumber %u\n", This, PaletteNumber); + if (PaletteNumber >= MAX_PALETTES) { - WARN("(%p) : (%u) Out of range 0-%u, returning Invalid Call\n", This, PaletteNumber, MAX_PALETTES); + ERR("(%p) : (%u) Out of range 0-%u, returning Invalid Call\n", This, PaletteNumber, MAX_PALETTES); return WINED3DERR_INVALIDCALL; } + + if (PaletteNumber >= This->NumberOfPalettes) { + NewSize = This->NumberOfPalettes; + do { + NewSize *= 2; + } while(PaletteNumber >= NewSize); + palettes = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->palettes, sizeof(PALETTEENTRY*) * NewSize); + if (!palettes) { + ERR("Out of memory!\n"); + return E_OUTOFMEMORY; + } + This->palettes = palettes; + This->NumberOfPalettes = NewSize; + } + + if (!This->palettes[PaletteNumber]) { + This->palettes[PaletteNumber] = HeapAlloc(GetProcessHeap(), 0, sizeof(PALETTEENTRY) * 256); + if (!This->palettes[PaletteNumber]) { + ERR("Out of memory!\n"); + return E_OUTOFMEMORY; + } + } + for (j = 0; j < 256; ++j) { This->palettes[PaletteNumber][j].peRed = pEntries[j].peRed; This->palettes[PaletteNumber][j].peGreen = pEntries[j].peGreen; @@ -5471,8 +5527,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPaletteEntries(IWineD3DDevice *ifa IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; int j; TRACE("(%p) : PaletteNumber %u\n", This, PaletteNumber); - if (PaletteNumber >= MAX_PALETTES) { - WARN("(%p) : (%u) Out of range 0-%u, returning Invalid Call\n", This, PaletteNumber, MAX_PALETTES); + if (PaletteNumber >= This->NumberOfPalettes || !This->palettes[PaletteNumber]) { + /* What happens in such situation isn't documented; Native seems to silently abort + on such conditions. Return Invalid Call. */ + ERR("(%p) : (%u) Non-existent palette. NumberOfPalettes %u\n", This, PaletteNumber, This->NumberOfPalettes); return WINED3DERR_INVALIDCALL; } for (j = 0; j < 256; ++j) { @@ -5488,8 +5546,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPaletteEntries(IWineD3DDevice *ifa static HRESULT WINAPI IWineD3DDeviceImpl_SetCurrentTexturePalette(IWineD3DDevice *iface, UINT PaletteNumber) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : PaletteNumber %u\n", This, PaletteNumber); - if (PaletteNumber >= MAX_PALETTES) { - WARN("(%p) : (%u) Out of range 0-%u, returning Invalid Call\n", This, PaletteNumber, MAX_PALETTES); + /* Native appears to silently abort on attempt to make an uninitialized palette current and render. + (tested with reference rasterizer). Return Invalid Call. */ + if (PaletteNumber >= This->NumberOfPalettes || !This->palettes[PaletteNumber]) { + ERR("(%p) : (%u) Non-existent palette. NumberOfPalettes %u\n", This, PaletteNumber, This->NumberOfPalettes); return WINED3DERR_INVALIDCALL; } /*TODO: stateblocks */ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e81a8ed..cdcf969 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1239,18 +1239,6 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat This->textures[i] = NULL; } - /* Defaulting palettes - Note these are device wide but reinitialized here for convenience*/ - for (i = 0; i < MAX_PALETTES; ++i) { - int j; - for (j = 0; j < 256; ++j) { - This->wineD3DDevice->palettes[i][j].peRed = 0xFF; - This->wineD3DDevice->palettes[i][j].peGreen = 0xFF; - This->wineD3DDevice->palettes[i][j].peBlue = 0xFF; - This->wineD3DDevice->palettes[i][j].peFlags = 0xFF; - } - } - This->wineD3DDevice->currentPalette = 0; - /* Set default GLSL program to NULL. We won't actually create one * until the app sets a vertex or pixel shader */ This->glsl_program = NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3696183..0abeb1d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -74,7 +74,7 @@ void hash_table_put(hash_table_t *table, void *key, void *value); void hash_table_remove(hash_table_t *table, void *key); /* Device caps */ -#define MAX_PALETTES 256 +#define MAX_PALETTES 65536 #define MAX_STREAMS 16 #define MAX_TEXTURES 8 #define MAX_FRAGMENT_SAMPLERS 16 @@ -364,7 +364,6 @@ extern int num_lock; /* Maximum number of constants provided to the shaders */ #define HIGHEST_TRANSFORMSTATE 512 /* Highest value in WINED3DTRANSFORMSTATETYPE */ -#define MAX_PALETTES 256 /* Checking of API calls */ /* --------------------- */ @@ -834,7 +833,8 @@ struct IWineD3DDeviceImpl IWineD3DSwapChain *lastActiveSwapChain; /* palettes texture management */ - PALETTEENTRY palettes[MAX_PALETTES][256]; + UINT NumberOfPalettes; + PALETTEENTRY **palettes; UINT currentPalette; UINT paletteConversionShader;

1 0

Dmitry Timoshkov : user32: Add a test for combobox navigation with arrow keys, make it pass under Wine.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 113f2c9dbbf13517ebcfb5986b1f81a8fbede1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=113f2c9dbbf13517ebcfb5986… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 27 14:35:59 2008 +0800 user32: Add a test for combobox navigation with arrow keys, make it pass under Wine. --- dlls/user32/combo.c | 29 +++++------ dlls/user32/listbox.c | 2 +- dlls/user32/tests/msg.c | 127 ++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 133 insertions(+), 25 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 549600e..14eebe8 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -884,16 +884,9 @@ static HBRUSH COMBO_PrepareColors( } else { - if (lphc->wState & CBF_EDIT) - { + /* FIXME: In which cases WM_CTLCOLORLISTBOX should be sent? */ hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLOREDIT, (WPARAM)hDC, (LPARAM)lphc->self ); - } - else - { - hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLORLISTBOX, - (WPARAM)hDC, (LPARAM)lphc->self ); - } } /* @@ -1350,6 +1343,14 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd ) TRACE("[%p]: lbox selection change [%x]\n", lphc->self, lphc->wState ); + /* do not roll up if selection is being tracked + * by arrowkeys in the dropdown listbox */ + if (!(lphc->wState & CBF_NOROLLUP)) + { + CBRollUp( lphc, (HIWORD(wParam) == LBN_SELCHANGE), TRUE ); + } + else lphc->wState &= ~CBF_NOROLLUP; + CB_NOTIFY( lphc, CBN_SELCHANGE ); if( HIWORD(wParam) == LBN_SELCHANGE) @@ -1363,17 +1364,11 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1)); } else + { InvalidateRect(lphc->self, &lphc->textRect, TRUE); + UpdateWindow(lphc->self); + } } - - /* do not roll up if selection is being tracked - * by arrowkeys in the dropdown listbox */ - if( ((lphc->wState & CBF_DROPPED) && !(lphc->wState & CBF_NOROLLUP)) ) - { - CBRollUp( lphc, (HIWORD(wParam) == LBN_SELCHANGE), TRUE ); - } - else lphc->wState &= ~CBF_NOROLLUP; - break; case LBN_SETFOCUS: diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 7232644..0b318fa 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2442,7 +2442,7 @@ static LRESULT LISTBOX_HandleKeyDown( LB_DESCR *descr, DWORD key ) LISTBOX_SetSelection( descr, caret, TRUE, FALSE); if (descr->style & LBS_NOTIFY) { - if( descr->lphc ) + if (descr->lphc && IsWindowVisible( descr->self )) { /* make sure that combo parent doesn't hide us */ descr->lphc->wState |= CBF_NOROLLUP; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b8d9375..ca166d8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -43,6 +43,10 @@ #define SW_NORMALNA 0xCC /* undoc. flag in MinMaximize */ +#ifndef WM_KEYF1 +#define WM_KEYF1 0x004d +#endif + #ifndef WM_SYSTIMER #define WM_SYSTIMER 0x0118 #endif @@ -2740,7 +2744,6 @@ static LRESULT WINAPI mdi_client_hook_proc(HWND hwnd, UINT message, WPARAM wPara message != WM_NCPAINT && message != WM_SYNCPAINT && message != WM_ERASEBKGND && - message != WM_NCPAINT && message != WM_NCHITTEST && message != WM_GETTEXT && message != WM_MDIGETACTIVE && @@ -2793,7 +2796,6 @@ static LRESULT WINAPI mdi_child_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, message != WM_NCPAINT && message != WM_SYNCPAINT && message != WM_ERASEBKGND && - message != WM_NCPAINT && message != WM_NCHITTEST && message != WM_GETTEXT && message != WM_GETICON && @@ -2863,7 +2865,6 @@ static LRESULT WINAPI mdi_frame_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, message != WM_NCPAINT && message != WM_SYNCPAINT && message != WM_ERASEBKGND && - message != WM_NCPAINT && message != WM_NCHITTEST && message != WM_GETTEXT && message != WM_GETICON && @@ -4855,7 +4856,6 @@ static LRESULT CALLBACK static_hook_proc(HWND hwnd, UINT message, WPARAM wParam, msg.lParam = lParam; add_message(&msg); - defwndproc_counter++; ret = CallWindowProcA(old_static_proc, hwnd, message, wParam, lParam); defwndproc_counter--; @@ -4918,6 +4918,111 @@ static void test_static_messages(void) } } +/****************** ComboBox message test *************************/ +#define ID_COMBOBOX 0x000f + +static const struct message WmKeyDownComboSeq[] = +{ + { WM_KEYDOWN, sent|wparam|lparam, VK_DOWN, 0 }, + { WM_COMMAND, sent|wparam, MAKEWPARAM(1000, LBN_SELCHANGE) }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_COMBOBOX, CBN_SELENDOK) }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_COMBOBOX, CBN_SELCHANGE) }, + { WM_CTLCOLOREDIT, sent|parent }, + { WM_KEYUP, sent|wparam|lparam, VK_DOWN, 0 }, + { 0 } +}; + +static WNDPROC old_combobox_proc; + +static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static long defwndproc_counter = 0; + LRESULT ret; + struct message msg; + + /* do not log painting messages */ + if (message != WM_PAINT && + message != WM_NCPAINT && + message != WM_SYNCPAINT && + message != WM_ERASEBKGND && + message != WM_NCHITTEST && + message != WM_GETTEXT && + message != WM_GETICON && + message != WM_DEVICECHANGE) + { + trace("combo: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent|wparam|lparam; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(&msg); + } + + defwndproc_counter++; + ret = CallWindowProcA(old_combobox_proc, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static void subclass_combobox(void) +{ + WNDCLASSA cls; + + if (!GetClassInfoA(0, "ComboBox", &cls)) assert(0); + + old_combobox_proc = cls.lpfnWndProc; + + cls.hInstance = GetModuleHandle(0); + cls.lpfnWndProc = combobox_hook_proc; + cls.lpszClassName = "my_combobox_class"; + UnregisterClass(cls.lpszClassName, cls.hInstance); + if (!RegisterClassA(&cls)) assert(0); +} + +static void test_combobox_messages(void) +{ + HWND parent, combo; + LRESULT ret; + + subclass_combobox(); + + parent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(parent != 0, "Failed to create parent window\n"); + flush_sequence(); + + combo = CreateWindowEx(0, "my_combobox_class", "test", WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | CBS_HASSTRINGS, + 0, 0, 100, 150, parent, (HMENU)ID_COMBOBOX, 0, NULL); + ok(combo != 0, "Failed to create combobox window\n"); + + UpdateWindow(combo); + + ret = SendMessage(combo, WM_GETDLGCODE, 0, 0); + ok(ret == (DLGC_WANTCHARS | DLGC_WANTARROWS), "wrong dlg_code %08lx\n", ret); + + ret = SendMessage(combo, CB_ADDSTRING, 0, (LPARAM)"item 0"); + ok(ret == 0, "expected 0, got %ld\n", ret); + ret = SendMessage(combo, CB_ADDSTRING, 0, (LPARAM)"item 1"); + ok(ret == 1, "expected 1, got %ld\n", ret); + ret = SendMessage(combo, CB_ADDSTRING, 0, (LPARAM)"item 2"); + ok(ret == 2, "expected 2, got %ld\n", ret); + + SendMessage(combo, CB_SETCURSEL, 0, 0); + SetFocus(combo); + flush_sequence(); + + log_all_parent_messages++; + SendMessage(combo, WM_KEYDOWN, VK_DOWN, 0); + SendMessage(combo, WM_KEYUP, VK_DOWN, 0); + log_all_parent_messages--; + ok_sequence(WmKeyDownComboSeq, "WM_KEYDOWN/VK_DOWN on a ComboBox", FALSE); + + DestroyWindow(combo); + DestroyWindow(parent); +} + /************* painting message test ********************/ void dump_region(HRGN hrgn) @@ -10038,6 +10143,8 @@ static LRESULT (WINAPI *listbox_orig_proc)(HWND, UINT, WPARAM, LPARAM); static LRESULT WINAPI listbox_hook_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) { + static long defwndproc_counter = 0; + LRESULT ret; struct message msg; /* do not log painting messages */ @@ -10059,7 +10166,11 @@ static LRESULT WINAPI listbox_hook_proc(HWND hwnd, UINT message, WPARAM wp, LPAR add_message(&msg); } - return CallWindowProcA(listbox_orig_proc, hwnd, message, wp, lp); + defwndproc_counter++; + ret = CallWindowProcA(listbox_orig_proc, hwnd, message, wp, lp); + defwndproc_counter--; + + return ret; } static void check_lb_state_dbg(HWND listbox, int count, int cur_sel, @@ -10078,7 +10189,7 @@ static void check_lb_state_dbg(HWND listbox, int count, int cur_sel, ok_(__FILE__, line)(ret == top_index, "expected top index %d, got %ld\n", top_index, ret); } -static void test_listbox(void) +static void test_listbox_messages(void) { HWND parent, listbox; LRESULT ret; @@ -10135,6 +10246,7 @@ static void test_listbox(void) log_all_parent_messages--; + DestroyWindow(listbox); DestroyWindow(parent); } @@ -10192,6 +10304,8 @@ START_TEST(msg) test_mdi_messages(); test_button_messages(); test_static_messages(); + test_listbox_messages(); + test_combobox_messages(); test_paint_messages(); test_interthread_messages(); test_message_conversion(); @@ -10216,7 +10330,6 @@ START_TEST(msg) test_nullCallback(); test_SetForegroundWindow(); test_dbcs_wm_char(); - test_listbox(); UnhookWindowsHookEx(hCBT_hook); if (pUnhookWinEvent)

1 0

Alistair Leslie-Hughes : msxml3: Correct IXMLDOMCDATASection appendData.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 9a7b81be9a49f4b9286e5dc161a188c210402b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7b81be9a49f4b9286e5dc16… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 27 14:39:07 2008 +1100 msxml3: Correct IXMLDOMCDATASection appendData. --- dlls/msxml3/cdata.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 1d646e2..06d8bb1 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -601,10 +601,7 @@ static HRESULT WINAPI domcdata_appendData( if(xmlTextConcat(pDOMNode->node, pContent, SysStringLen(p) ) == 0) hr = S_OK; else - { hr = E_FAIL; - xmlFree(pContent); - } } else hr = E_FAIL;

1 0

Alistair Leslie-Hughes : msxml3: Correct IXMLDOMComment appendData.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: d9b1bf541f9936e9ae17567527a9946fa848b187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9b1bf541f9936e9ae1756752… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 27 10:32:10 2008 +1100 msxml3: Correct IXMLDOMComment appendData. --- dlls/msxml3/comment.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 3229465..c4d37f2 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -600,10 +600,7 @@ static HRESULT WINAPI domcomment_appendData( if(xmlTextConcat(pDOMNode->node, pContent, SysStringLen(p) ) == 0) hr = S_OK; else - { hr = E_FAIL; - xmlFree(pContent); - } } else hr = E_FAIL;

1 0

Alistair Leslie-Hughes : msxml3: Correct IXMLDOMText appendData.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: d3597f5e13c3de821b4b404de6f98720e9387b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3597f5e13c3de821b4b404de… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 27 14:37:04 2008 +1100 msxml3: Correct IXMLDOMText appendData. --- dlls/msxml3/text.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 52163a2..4b32ac9 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -603,10 +603,7 @@ static HRESULT WINAPI domtext_appendData( if(xmlTextConcat(pDOMNode->node, pContent, SysStringLen(p) ) == 0) hr = S_OK; else - { hr = E_FAIL; - xmlFree(pContent); - } } else hr = E_FAIL;

1 0

Alexander Nicolaysen Sørnes : wordpad: Add support for previewing two pages side-by-side.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 1ea82f7cd4eda5ccb2b3783df14457acfe2b8c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ea82f7cd4eda5ccb2b3783df… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Mar 27 01:39:05 2008 +0100 wordpad: Add support for previewing two pages side-by-side. --- programs/wordpad/De.rc | 2 + programs/wordpad/En.rc | 2 + programs/wordpad/Fr.rc | 2 + programs/wordpad/Hu.rc | 2 + programs/wordpad/Ko.rc | 2 + programs/wordpad/Nl.rc | 2 + programs/wordpad/No.rc | 2 + programs/wordpad/Pl.rc | 2 + programs/wordpad/Ru.rc | 2 + programs/wordpad/Tr.rc | 2 + programs/wordpad/print.c | 201 +++++++++++++++++++++++++++++++------------- programs/wordpad/wordpad.h | 12 ++- 12 files changed, 172 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ea82f7cd4eda5ccb2b37…

1 0

Francois Gouget : ddraw: Remove trailing spaces in ok() calls.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: eab196b35a17b199c749b94859f95bc6b41a5da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab196b35a17b199c749b9485… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 26 23:33:04 2008 +0100 ddraw: Remove trailing spaces in ok() calls. --- dlls/ddraw/tests/d3d.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 9281b37..f8c1a9b 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1560,8 +1560,8 @@ static void VertexBufferDescTest(void) skip("GetVertexBuffer Failed!\n"); ok( mem.desc2.dwSize == sizeof(D3DVERTEXBUFFERDESC)*2, "Size returned from GetVertexBufferDesc does not match the value put in\n" ); ok( mem.buffer[sizeof(D3DVERTEXBUFFERDESC)] == 0x12, "GetVertexBufferDesc cleared outside of the struct! (dwSize was double the size of the struct)\n"); - ok( mem.desc2.dwCaps == desc.dwCaps, "dwCaps returned differs. Got %x, expected %x \n", mem.desc2.dwCaps, desc.dwCaps); - ok( mem.desc2.dwFVF == desc.dwFVF, "dwFVF returned differs. Got %x, expected %x \n", mem.desc2.dwFVF, desc.dwFVF); + ok( mem.desc2.dwCaps == desc.dwCaps, "dwCaps returned differs. Got %x, expected %x\n", mem.desc2.dwCaps, desc.dwCaps); + ok( mem.desc2.dwFVF == desc.dwFVF, "dwFVF returned differs. Got %x, expected %x\n", mem.desc2.dwFVF, desc.dwFVF); ok (mem.desc2.dwNumVertices == desc.dwNumVertices, "dwNumVertices returned differs. Got %x, expected %x\n", mem.desc2.dwNumVertices, desc.dwNumVertices); memset(mem.buffer, 0x12, sizeof(mem.buffer)); @@ -1571,8 +1571,8 @@ static void VertexBufferDescTest(void) skip("GetVertexBuffer Failed!\n"); ok( mem.desc2.dwSize == 0, "Size returned from GetVertexBufferDesc does not match the value put in\n" ); ok( mem.buffer[sizeof(D3DVERTEXBUFFERDESC)] == 0x12, "GetVertexBufferDesc cleared outside of the struct! (dwSize was 0)\n"); - ok( mem.desc2.dwCaps == desc.dwCaps, "dwCaps returned differs. Got %x, expected %x \n", mem.desc2.dwCaps, desc.dwCaps); - ok( mem.desc2.dwFVF == desc.dwFVF, "dwFVF returned differs. Got %x, expected %x \n", mem.desc2.dwFVF, desc.dwFVF); + ok( mem.desc2.dwCaps == desc.dwCaps, "dwCaps returned differs. Got %x, expected %x\n", mem.desc2.dwCaps, desc.dwCaps); + ok( mem.desc2.dwFVF == desc.dwFVF, "dwFVF returned differs. Got %x, expected %x\n", mem.desc2.dwFVF, desc.dwFVF); ok (mem.desc2.dwNumVertices == desc.dwNumVertices, "dwNumVertices returned differs. Got %x, expected %x\n", mem.desc2.dwNumVertices, desc.dwNumVertices); memset(mem.buffer, 0x12, sizeof(mem.buffer)); @@ -1582,8 +1582,8 @@ static void VertexBufferDescTest(void) skip("GetVertexBuffer Failed!\n"); ok( mem.desc2.dwSize == sizeof(D3DVERTEXBUFFERDESC), "Size returned from GetVertexBufferDesc does not match the value put in\n" ); ok( mem.buffer[sizeof(D3DVERTEXBUFFERDESC)] == 0x12, "GetVertexBufferDesc cleared outside of the struct! (dwSize was the size of the struct)\n"); - ok( mem.desc2.dwCaps == desc.dwCaps, "dwCaps returned differs. Got %x, expected %x \n", mem.desc2.dwCaps, desc.dwCaps); - ok( mem.desc2.dwFVF == desc.dwFVF, "dwFVF returned differs. Got %x, expected %x \n", mem.desc2.dwFVF, desc.dwFVF); + ok( mem.desc2.dwCaps == desc.dwCaps, "dwCaps returned differs. Got %x, expected %x\n", mem.desc2.dwCaps, desc.dwCaps); + ok( mem.desc2.dwFVF == desc.dwFVF, "dwFVF returned differs. Got %x, expected %x\n", mem.desc2.dwFVF, desc.dwFVF); ok (mem.desc2.dwNumVertices == desc.dwNumVertices, "dwNumVertices returned differs. Got %x, expected %x\n", mem.desc2.dwNumVertices, desc.dwNumVertices); out:

1 0

Michael Stefaniuc : user32: Add the Romanian translation.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: c68a8963c85c9eeaec9f70ca0dca297182e940f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68a8963c85c9eeaec9f70ca0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 27 00:22:57 2008 +0100 user32: Add the Romanian translation. --- dlls/user32/resources/user32.rc | 1 + dlls/user32/resources/user32_Ro.rc | 90 ++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/user32/resources/user32.rc b/dlls/user32/resources/user32.rc index 2880f2c..67f7a13 100644 --- a/dlls/user32/resources/user32.rc +++ b/dlls/user32/resources/user32.rc @@ -61,6 +61,7 @@ #include "resources/user32_No.rc" #include "resources/user32_Pl.rc" #include "resources/user32_Pt.rc" +#include "resources/user32_Ro.rc" #include "resources/user32_Ru.rc" #include "resources/user32_Si.rc" #include "resources/user32_Sk.rc" diff --git a/dlls/user32/resources/user32_Ro.rc b/dlls/user32/resources/user32_Ro.rc new file mode 100644 index 0000000..b2b7cd3 --- /dev/null +++ b/dlls/user32/resources/user32_Ro.rc @@ -0,0 +1,90 @@ +/* + * Copyright 1995 Alexandre Julliard + * Copyright 2008 Michael Stefaniuc + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + MENUITEM "&Restabilește", 61728 + MENUITEM "&Mută", 61456 + MENUITEM "M&ărime", 61440 + MENUITEM "Mi&nimizează", 61472 + MENUITEM "Ma&ximizează", 61488 + MENUITEM SEPARATOR + MENUITEM "&Închide\tAlt-F4", 61536 + MENUITEM SEPARATOR + MENUITEM "&Comută la ...\tCtrl-Esc", 61744 + MENUITEM SEPARATOR + MENUITEM "&Despre WINE ...", 61761 + MENUITEM SEPARATOR + MENUITEM "&Pune 'Debug mark' în jurnalul de depanare", 61762 +} + +EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + POPUP "" + BEGIN + MENUITEM "&Des-face", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "&Taie", WM_CUT + MENUITEM "&Copiază", WM_COPY + MENUITEM "&Inserează", WM_PASTE + MENUITEM "&Șterge", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "&Selectează tot", EM_SETSEL + END +} + +MSGBOX DIALOG 100, 80, 216, 168 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +BEGIN + ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE + LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX + PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Renunță", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Anulează", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "R&eîncearcă", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ignoră", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Da", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Nu", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Încearcă din nou", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Continuă", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ajutor", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Selectare fereastră" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ + DEFPUSHBUTTON "OK", IDOK, 75, 100, 35, 14 + PUSHBUTTON "Renunță", IDCANCEL, 120, 100, 35, 14 +END + + +STRINGTABLE DISCARDABLE +{ + IDS_ERROR "Eroare" + IDS_MDI_MOREWINDOWS "&Mai multe ferestre..." +} + +#pragma code_page(default)

1 0

Michael Stefaniuc : winhelp: Update the German translation.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 9b767a159b0b1778f1aff536a33d93abfc85419c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b767a159b0b1778f1aff536a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 27 00:22:26 2008 +0100 winhelp: Update the German translation. --- programs/winhelp/De.rc | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/De.rc b/programs/winhelp/De.rc index 8ec84cd..783226d 100644 --- a/programs/winhelp/De.rc +++ b/programs/winhelp/De.rc @@ -50,6 +50,16 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER + PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 + PUSHBUTTON "&Abbrechen", IDCANCEL, 120, 170, 50, 12 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -64,8 +74,8 @@ STID_CONTENTS, "&Inhalt" STID_SEARCH, "&Suchen" STID_BACK, "&Zur�ck" STID_HISTORY, "&Bisher" -STID_TOPICS, "&Topics" +STID_TOPICS, "&Themen" STID_ALL_FILES, "Alle Dateien (*.*)" STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_FILE_NOT_FOUND_s "'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei suchen?" }

1 0

Aurimas Fischer : fonts: Where possible use references to Latin glyphs in Latin-Extended glyphs.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: 699d76e4acc95b3c1e4611b4c935d24129477ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=699d76e4acc95b3c1e4611b4c… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Wed Mar 26 23:44:27 2008 +0200 fonts: Where possible use references to Latin glyphs in Latin-Extended glyphs. --- fonts/tahoma.sfd | 2001 +++++++++------------------------------------------- fonts/tahoma.ttf | Bin 88648 -> 84400 bytes fonts/tahomabd.sfd | 10 +- fonts/tahomabd.ttf | Bin 62316 -> 62316 bytes 4 files changed, 342 insertions(+), 1669 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=699d76e4acc95b3c1e461…

1 0