wine-commits September 2008

wine-commits@winehq.org

3 participants
1215 discussions

Alexandre Julliard : msvcrt/tests: Fix the %n format test for Vista.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 3e78cca50c75dbb0e3f7c16596c41385371c884e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e78cca50c75dbb0e3f7c1659… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 4 12:27:29 2008 +0200 msvcrt/tests: Fix the %n format test for Vista. --- dlls/msvcrt/tests/printf.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 040c4a7..1603893 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -390,9 +390,18 @@ static void test_sprintf( void ) format = "asdf%n"; x = 0; r = sprintf(buffer, format, &x ); - ok(x == 4, "should write to x: %d\n", x); - ok(!strcmp(buffer,"asdf"), "failed\n"); - ok( r==4, "return count wrong: %d\n", r); + if (r == -1) + { + /* %n format is disabled by default on vista */ + /* FIXME: should test with _set_printf_count_output */ + ok(x == 0, "should not write to x: %d\n", x); + } + else + { + ok(x == 4, "should write to x: %d\n", x); + ok(!strcmp(buffer,"asdf"), "failed\n"); + ok( r==4, "return count wrong: %d\n", r); + } format = "%-1d"; r = sprintf(buffer, format,2);

1 0

Rico Schüller : wined3d/d3d9: Set the initial scissorrect to the dimesions of the backbuffer from the first swapchain of the device .
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 525e30e6b7aa7f70576de78ee136065fea0e1e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=525e30e6b7aa7f70576de78ee… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Aug 31 12:20:28 2008 +0200 wined3d/d3d9: Set the initial scissorrect to the dimesions of the backbuffer from the first swapchain of the device. --- dlls/d3d9/tests/device.c | 96 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/stateblock.c | 30 +++++++++++++ dlls/wined3d/swapchain_base.c | 9 ++++ 3 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3164b81..41dcafb 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3,6 +3,7 @@ * Copyright (C) 2006 Chris Robinson * Copyright (C) 2006-2007 Stefan D�singer(For CodeWeavers) * Copyright 2007 Henri Verbeet + * Copyright (C) 2008 Rico Sch�ller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2016,6 +2017,100 @@ static void test_display_formats() if(d3d9) IDirect3D9_Release(d3d9); } +static void test_scissor_size(void) +{ + IDirect3D9 *d3d9_ptr = 0; + int i; + static const struct { + int winx; int winy; int backx; int backy; BOOL window; + } scts[] = { /* scissor tests */ + {800, 600, 640, 480, TRUE}, + {800, 600, 640, 480, FALSE}, + {640, 480, 800, 600, TRUE}, + {640, 480, 800, 600, FALSE}, + }; + + d3d9_ptr = pDirect3DCreate9(D3D_SDK_VERSION); + ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); + if (!d3d9_ptr){ + skip("Failed to create IDirect3D9 object\n"); + return; + } + + for(i=0; i<sizeof(scts)/sizeof(scts[0]); i++) { + IDirect3DDevice9 *device_ptr = 0; + D3DPRESENT_PARAMETERS present_parameters; + HRESULT hr; + WNDCLASS wc = {0}; + HWND hwnd = 0; + RECT scissorrect; + + wc.lpfnWndProc = DefWindowProc; + wc.lpszClassName = "d3d9_test_wc"; + RegisterClass(&wc); + + hwnd = CreateWindow("d3d9_test_wc", "d3d9_test", + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, scts[i].winx, scts[i].winy, 0, 0, 0, 0); + + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = scts[i].window; + present_parameters.hDeviceWindow = hwnd; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferWidth = scts[i].backx; + present_parameters.BackBufferHeight = scts[i].backy; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + if(FAILED(hr)) { + present_parameters.AutoDepthStencilFormat = D3DFMT_D16; + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + if(FAILED(hr)) { + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + } + } + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D_CreateDevice returned: %08x\n", hr); + + if (!device_ptr) + { + DestroyWindow(hwnd); + skip("Creating the device failed\n"); + goto err_out; + } + + /* Check for the default scissor rect size */ + hr = IDirect3DDevice9_GetScissorRect(device_ptr, &scissorrect); + ok(hr == D3D_OK, "IDirect3DDevice9_GetScissorRect failed with: %08x\n", hr); + ok(scissorrect.right == scts[i].backx && scissorrect.bottom == scts[i].backy && scissorrect.top == 0 && scissorrect.left == 0, "Scissorrect missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, scts[i].backx, scts[i].backy); + + /* check the scissorrect values after a reset */ + present_parameters.BackBufferWidth = 1024; + present_parameters.BackBufferHeight = 768; + hr = IDirect3DDevice9_Reset(device_ptr, &present_parameters); + ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); + hr = IDirect3DDevice9_TestCooperativeLevel(device_ptr); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); + + hr = IDirect3DDevice9_GetScissorRect(device_ptr, &scissorrect); + ok(hr == D3D_OK, "IDirect3DDevice9_GetScissorRect failed with: %08x\n", hr); + ok(scissorrect.right == 1024 && scissorrect.bottom == 768 && scissorrect.top == 0 && scissorrect.left == 0, "Scissorrect missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, 1024, 768); + + if(device_ptr) { + ULONG ref; + + ref = IDirect3DDevice9_Release(device_ptr); + DestroyWindow(hwnd); + ok(ref == 0, "The device was not properly freed: refcount %u\n", ref); + } + } + +err_out: + if(d3d9_ptr) IDirect3D9_Release(d3d9_ptr); + return; +} + + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -2045,5 +2140,6 @@ START_TEST(device) test_vertex_buffer_alignment(); test_lights(); test_set_stream_source(); + test_scissor_size(); } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e8ff6c1..78268d8 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1037,6 +1037,12 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat DWORD d; } tmpfloat; unsigned int i; + IWineD3DSwapChain *swapchain; + IWineD3DSurface *backbuffer; + WINED3DSURFACE_DESC desc = {0}; + UINT width, height; + RECT scissorrect; + HRESULT hr; /* Note this may have a large overhead but it should only be executed once, in order to initialize the complete state of the device and @@ -1239,6 +1245,30 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat This->textures[i] = NULL; } + /* Set the default scissor rect values */ + desc.Width = &width; + desc.Height = &height; + + /* check the return values, because the GetBackBuffer call isn't valid for ddraw */ + hr = IWineD3DDevice_GetSwapChain(device, 0, &swapchain); + if( hr == WINED3D_OK && swapchain != NULL) { + hr = IWineD3DSwapChain_GetBackBuffer(swapchain, 0, WINED3DBACKBUFFER_TYPE_MONO, &backbuffer); + if( hr == WINED3D_OK && backbuffer != NULL) { + IWineD3DSurface_GetDesc(backbuffer, &desc); + IWineD3DSurface_Release(backbuffer); + + scissorrect.left = 0; + scissorrect.right = width; + scissorrect.top = 0; + scissorrect.bottom = height; + hr = IWineD3DDevice_SetScissorRect(device, &scissorrect); + if( hr != WINED3D_OK ) { + ERR("This should never happen, expect rendering issues!\n"); + } + } + IWineD3DSwapChain_Release(swapchain); + } + TRACE("-----------------------> Device defaults now set up...\n"); return WINED3D_OK; } diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c index 6b91234..75adf77 100644 --- a/dlls/wined3d/swapchain_base.c +++ b/dlls/wined3d/swapchain_base.c @@ -102,6 +102,15 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetBackBuffer(IWineD3DSwapChain *iface, return WINED3DERR_INVALIDCALL; } + /* Return invalid if there is no backbufferarray, otherwise it will crash when ddraw is + * used (there This->backBuffer is allways NULL). We need this because this function have + * to be called from IWineD3DStateBlockImpl_InitStartupStateBlock to get the default + * scissorrect dimensions. */ + if( !This->backBuffer ) { + *ppBackBuffer = NULL; + return WINED3DERR_INVALIDCALL; + } + *ppBackBuffer = This->backBuffer[iBackBuffer]; TRACE("(%p) : BackBuf %d Type %d returning %p\n", This, iBackBuffer, Type, *ppBackBuffer);

1 0

Dmitry Timoshkov : ntdll: Add support for NtSetInformationProcess( ProcessExecuteFlags).
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 97f2cbc1ea01ba1bc6024d73739c7f459a1bf1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f2cbc1ea01ba1bc6024d737… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Sep 4 17:37:23 2008 +0900 ntdll: Add support for NtSetInformationProcess(ProcessExecuteFlags). --- dlls/ntdll/process.c | 22 ++++++++++++++++++++++ include/winternl.h | 5 +++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 2a09390..3179d9c 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -389,6 +389,28 @@ NTSTATUS WINAPI NtSetInformationProcess( SERVER_END_REQ; } break; + + case ProcessExecuteFlags: + if (ProcessInformationLength != sizeof(ULONG)) + return STATUS_INVALID_PARAMETER; + else + { + BOOL enable; + switch (*(ULONG *)ProcessInformation & (MEM_EXECUTE_OPTION_ENABLE|MEM_EXECUTE_OPTION_DISABLE)) + { + case MEM_EXECUTE_OPTION_ENABLE: + enable = FALSE; + break; + case MEM_EXECUTE_OPTION_DISABLE: + enable = TRUE; + break; + default: + return STATUS_INVALID_PARAMETER; + } + VIRTUAL_SetForceExec( enable ); + } + break; + default: FIXME("(%p,0x%08x,%p,0x%08x) stub\n", ProcessHandle,ProcessInformationClass,ProcessInformation, diff --git a/include/winternl.h b/include/winternl.h index 2dc1fc2..71169fa 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -665,9 +665,14 @@ typedef enum _PROCESSINFOCLASS { ProcessDebugObjectHandle = 30, ProcessDebugFlags = 31, ProcessHandleTracing = 32, + ProcessExecuteFlags = 34, MaxProcessInfoClass } PROCESSINFOCLASS, PROCESS_INFORMATION_CLASS; +#define MEM_EXECUTE_OPTION_DISABLE 0x01 +#define MEM_EXECUTE_OPTION_ENABLE 0x02 +#define MEM_EXECUTE_OPTION_PERMANENT 0x08 + typedef enum _SECTION_INHERIT { ViewShare = 1, ViewUnmap = 2

1 0

Jeff Zaroyko : winetest: Check that user enters a tag.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 454a241e97ba99b0f7452b306320f69cce393778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454a241e97ba99b0f7452b306… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Thu Sep 4 18:06:46 2008 +1000 winetest: Check that user enters a tag. --- programs/winetest/gui.c | 4 ++++ programs/winetest/main.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index b738679..2957dbf 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -337,6 +337,10 @@ AskTagProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) switch (LOWORD (wParam)) { case IDOK: len = GetWindowTextLengthA (GetDlgItem (hwnd, IDC_TAG)); + if(!len) { + report (R_WARNING, "You must enter a tag to continue"); + return FALSE; + } tag = xmalloc (len+1); GetDlgItemTextA (hwnd, IDC_TAG, tag, len+1); EndDialog (hwnd, IDOK); diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 045845a..86035f0 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -672,7 +672,7 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, SetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", "0" ); } - if (!tag) { + while (!tag) { if (!interactive) report (R_FATAL, "Please specify a tag (-t option) if " "running noninteractive!");

1 0

James Hawkins : msi: Source for new patch files can only be compressed.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 3f00006f1f14dfabfdc7f85687d8777b8334523e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f00006f1f14dfabfdc7f8568… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Sep 3 21:35:07 2008 -0500 msi: Source for new patch files can only be compressed. --- dlls/msi/action.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8cd5923..8a8efe7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1481,7 +1481,8 @@ static UINT load_file(MSIRECORD *row, LPVOID param) /* if the compressed bits are not set in the file attributes, * then read the information from the package word count property */ - if (file->Attributes & msidbFileAttributesCompressed) + if (file->Attributes & + (msidbFileAttributesCompressed | msidbFileAttributesPatchAdded)) { file->IsCompressed = TRUE; }

1 0

Nicolas Le Cam : comctl32: Implement LVM_GETUNICODEFORMAT.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 22e69c0ee49e3f10f7591d170b65bff19b61b12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e69c0ee49e3f10f7591d170… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Sep 4 01:24:26 2008 +0200 comctl32: Implement LVM_GETUNICODEFORMAT. --- dlls/comctl32/listview.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c620892..35fd131 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9709,9 +9709,8 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_GETTOPINDEX: return LISTVIEW_GetTopIndex(infoPtr); - /*case LVM_GETUNICODEFORMAT: - FIXME("LVM_GETUNICODEFORMAT: unimplemented\n"); - return FALSE;*/ + case LVM_GETUNICODEFORMAT: + return (infoPtr->notifyFormat == NFR_UNICODE); /* case LVM_GETVIEW: */

1 0

Alexander Nicolaysen Sørnes : regedit: Fix a memory leak in export handling.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 92e9b1edcfd4368e293f43a95acb3a37cf761a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e9b1edcfd4368e293f43a95… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Sep 3 17:44:48 2008 +0200 regedit: Fix a memory leak in export handling. --- programs/regedit/regproc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index a085ae4..b9825d4 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1165,6 +1165,7 @@ BOOL export_registry_key(CHAR *file_name, CHAR *reg_key_name) fclose(file); } HeapFree(GetProcessHeap(), 0, reg_key_name); + HeapFree(GetProcessHeap(), 0, val_name_buf); HeapFree(GetProcessHeap(), 0, val_buf); return TRUE; }

1 0

Alexander Nicolaysen Sørnes : regedit: Convert open/save dialogues to unicode.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 5defba1165868ab5165c46ca499fe0f7c73f7e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5defba1165868ab5165c46ca4… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Sep 3 15:54:00 2008 +0200 regedit: Convert open/save dialogues to unicode. --- programs/regedit/framewnd.c | 73 +++++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 34 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index a8e4c5c..ea0d39b 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -43,9 +43,9 @@ static WCHAR favoriteName[128]; static WCHAR searchString[128]; static int searchMask = SEARCH_KEYS | SEARCH_VALUES | SEARCH_CONTENT; -static TCHAR FileNameBuffer[_MAX_PATH]; -static TCHAR FileTitleBuffer[_MAX_PATH]; -static TCHAR FilterBuffer[_MAX_PATH]; +static WCHAR FileNameBuffer[_MAX_PATH]; +static WCHAR FileTitleBuffer[_MAX_PATH]; +static WCHAR FilterBuffer[_MAX_PATH]; /******************************************************************************* * Local module support methods @@ -247,42 +247,40 @@ static BOOL CheckCommDlgError(HWND hWnd) return TRUE; } -static void ExportRegistryFile_StoreSelection(HWND hdlg, OPENFILENAME *pOpenFileName) +static void ExportRegistryFile_StoreSelection(HWND hdlg, OPENFILENAMEW *pOpenFileName) { if (IsDlgButtonChecked(hdlg, IDC_EXPORT_SELECTED)) { - INT len = SendDlgItemMessage(hdlg, IDC_EXPORT_PATH, WM_GETTEXTLENGTH, 0, 0); - pOpenFileName->lCustData = (LPARAM)HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(TCHAR)); - SendDlgItemMessage(hdlg, IDC_EXPORT_PATH, WM_GETTEXT, len+1, pOpenFileName->lCustData); + INT len = SendDlgItemMessageW(hdlg, IDC_EXPORT_PATH, WM_GETTEXTLENGTH, 0, 0); + pOpenFileName->lCustData = (LPARAM)HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); + SendDlgItemMessageW(hdlg, IDC_EXPORT_PATH, WM_GETTEXT, len+1, pOpenFileName->lCustData); } else - pOpenFileName->lCustData = (LPARAM)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TCHAR)); + pOpenFileName->lCustData = (LPARAM)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)); } static UINT CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { - static OPENFILENAME* pOpenFileName; - OFNOTIFY *pOfNotify; + static OPENFILENAMEW* pOpenFileName; + OFNOTIFYW *pOfNotify; switch (uiMsg) { case WM_INITDIALOG: - pOpenFileName = (OPENFILENAME*)lParam; + pOpenFileName = (OPENFILENAMEW*)lParam; break; case WM_COMMAND: if (LOWORD(wParam) == IDC_EXPORT_PATH && HIWORD(wParam) == EN_UPDATE) CheckRadioButton(hdlg, IDC_EXPORT_ALL, IDC_EXPORT_SELECTED, IDC_EXPORT_SELECTED); break; case WM_NOTIFY: - pOfNotify = (OFNOTIFY*)lParam; + pOfNotify = (OFNOTIFYW*)lParam; switch (pOfNotify->hdr.code) { case CDN_INITDONE: { - WCHAR* pathW = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); - CHAR* pathA = GetMultiByteString(pathW); - SendDlgItemMessage(hdlg, IDC_EXPORT_PATH, WM_SETTEXT, 0, (LPARAM)pathA); - HeapFree(GetProcessHeap(), 0, pathW); - HeapFree(GetProcessHeap(), 0, pathA); + WCHAR* path = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); + SendDlgItemMessageW(hdlg, IDC_EXPORT_PATH, WM_SETTEXT, 0, (LPARAM)path); + HeapFree(GetProcessHeap(), 0, path); CheckRadioButton(hdlg, IDC_EXPORT_ALL, IDC_EXPORT_SELECTED, pOpenFileName->lCustData ? IDC_EXPORT_SELECTED : IDC_EXPORT_ALL); break; } @@ -298,15 +296,15 @@ static UINT CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARA } -static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME *pofn) +static BOOL InitOpenFileName(HWND hWnd, OPENFILENAMEW *pofn) { - memset(pofn, 0, sizeof(OPENFILENAME)); - pofn->lStructSize = sizeof(OPENFILENAME); + memset(pofn, 0, sizeof(OPENFILENAMEW)); + pofn->lStructSize = sizeof(OPENFILENAMEW); pofn->hwndOwner = hWnd; pofn->hInstance = hInst; if (FilterBuffer[0] == 0) - LoadString(hInst, IDS_FILEDIALOG_FILTER, FilterBuffer, _MAX_PATH); + LoadStringW(hInst, IDS_FILEDIALOG_FILTER, FilterBuffer, _MAX_PATH); pofn->lpstrFilter = FilterBuffer; pofn->nFilterIndex = 1; pofn->lpstrFile = FileNameBuffer; @@ -336,17 +334,20 @@ static BOOL import_registry_filename(LPTSTR filename) static BOOL ImportRegistryFile(HWND hWnd) { - OPENFILENAME ofn; - TCHAR title[128]; + OPENFILENAMEW ofn; + WCHAR title[128]; InitOpenFileName(hWnd, &ofn); - LoadString(hInst, IDS_FILEDIALOG_IMPORT_TITLE, title, COUNT_OF(title)); + LoadStringW(hInst, IDS_FILEDIALOG_IMPORT_TITLE, title, COUNT_OF(title)); ofn.lpstrTitle = title; - if (GetOpenFileName(&ofn)) { - if (!import_registry_filename(ofn.lpstrFile)) { + if (GetOpenFileNameW(&ofn)) { + CHAR* fileA = GetMultiByteString(ofn.lpstrFile); + if (!import_registry_filename(fileA)) { /*printf("Can't open file \"%s\"\n", ofn.lpstrFile);*/ + HeapFree(GetProcessHeap(), 0, fileA); return FALSE; } + HeapFree(GetProcessHeap(), 0, fileA); } else { CheckCommDlgError(hWnd); } @@ -357,21 +358,25 @@ static BOOL ImportRegistryFile(HWND hWnd) static BOOL ExportRegistryFile(HWND hWnd, BOOL export_branch) { - OPENFILENAME ofn; - TCHAR ExportKeyPath[_MAX_PATH]; - TCHAR title[128]; + OPENFILENAMEW ofn; + WCHAR ExportKeyPath[_MAX_PATH]; + WCHAR title[128]; - ExportKeyPath[0] = _T('\0'); + ExportKeyPath[0] = 0; InitOpenFileName(hWnd, &ofn); - LoadString(hInst, IDS_FILEDIALOG_EXPORT_TITLE, title, COUNT_OF(title)); + LoadStringW(hInst, IDS_FILEDIALOG_EXPORT_TITLE, title, COUNT_OF(title)); ofn.lpstrTitle = title; ofn.lCustData = export_branch; ofn.Flags = OFN_ENABLETEMPLATE | OFN_ENABLEHOOK | OFN_EXPLORER | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; ofn.lpfnHook = ExportRegistryFile_OFNHookProc; - ofn.lpTemplateName = MAKEINTRESOURCE(IDD_EXPORT_TEMPLATE); - if (GetSaveFileName(&ofn)) { + ofn.lpTemplateName = MAKEINTRESOURCEW(IDD_EXPORT_TEMPLATE); + if (GetSaveFileNameW(&ofn)) { BOOL result; - result = export_registry_key(ofn.lpstrFile, (LPTSTR)ofn.lCustData); + CHAR* fileA = GetMultiByteString(ofn.lpstrFile); + CHAR* sectionA = GetMultiByteString((LPWSTR)ofn.lCustData); + result = export_registry_key(fileA, sectionA); + HeapFree(GetProcessHeap(), 0, fileA); + HeapFree(GetProcessHeap(), 0, sectionA); if (!result) { /*printf("Can't open file \"%s\"\n", ofn.lpstrFile);*/ return FALSE;

1 0

Jacek Caban : jscript: Added parser memory managment.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 720e8c625225a91109c77ce11c34e4e2dc3977be URL: http://source.winehq.org/git/wine.git/?a=commit;h=720e8c625225a91109c77ce11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 3 00:26:10 2008 +0200 jscript: Added parser memory managment. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/engine.h | 7 ++- dlls/jscript/jscript.h | 19 ++++++++ dlls/jscript/jsutils.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/parser.y | 5 ++ 5 files changed, 142 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 3ccfae3..96d8c37 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ engine.c \ jscript.c \ jscript_main.c \ + jsutils.c \ lex.c IDL_TLB_SRCS = jsglobal.idl diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 3e558bd..1fad3dd 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -29,6 +29,9 @@ typedef struct _parser_ctx_t { source_elements_t *source; BOOL nl; HRESULT hres; + + jsheap_t tmp_heap; + jsheap_t heap; } parser_ctx_t; HRESULT script_parse(script_ctx_t*,const WCHAR*,parser_ctx_t**); @@ -43,12 +46,12 @@ static inline void parser_addref(parser_ctx_t *ctx) static inline void *parser_alloc(parser_ctx_t *ctx, DWORD size) { - return heap_alloc(size); /* FIXME */ + return jsheap_alloc(&ctx->heap, size); } static inline void *parser_alloc_tmp(parser_ctx_t *ctx, DWORD size) { - return heap_alloc(size); /* FIXME */ + return jsheap_alloc(&ctx->tmp_heap, size); } typedef struct { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 6f43adc..ffb3f2b 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -29,6 +29,7 @@ #include "activscp.h" #include "wine/unicode.h" +#include "wine/list.h" typedef struct _script_ctx_t script_ctx_t; @@ -62,6 +63,19 @@ static void inline script_addref(script_ctx_t *ctx) HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); +typedef struct { + void **blocks; + DWORD block_cnt; + DWORD last_block; + DWORD offset; + struct list custom_blocks; +} jsheap_t; + +void jsheap_init(jsheap_t*); +void *jsheap_alloc(jsheap_t*,DWORD); +void jsheap_clear(jsheap_t*); +void jsheap_free(jsheap_t*); + extern LONG module_ref; static inline void lock_module(void) @@ -84,6 +98,11 @@ static inline void *heap_alloc_zero(size_t len) return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c new file mode 100644 index 0000000..4f84e88 --- /dev/null +++ b/dlls/jscript/jsutils.c @@ -0,0 +1,112 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * 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 + */ + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +#define MIN_BLOCK_SIZE 128 + +static inline DWORD block_size(DWORD block) +{ + return MIN_BLOCK_SIZE << block; +} + +void jsheap_init(jsheap_t *heap) +{ + memset(heap, 0, sizeof(*heap)); + list_init(&heap->custom_blocks); +} + +void *jsheap_alloc(jsheap_t *heap, DWORD size) +{ + struct list *list; + void *tmp; + + if(!heap->block_cnt) { + if(!heap->blocks) { + heap->blocks = heap_alloc(sizeof(void*)); + if(!heap->blocks) + return NULL; + } + + tmp = heap_alloc(block_size(0)); + if(!tmp) + return NULL; + + heap->blocks[0] = tmp; + heap->block_cnt = 1; + } + + if(heap->offset + size < block_size(heap->last_block)) { + tmp = ((BYTE*)heap->blocks[heap->last_block])+heap->offset; + heap->offset += size; + return tmp; + } + + if(size < block_size(heap->last_block+1)) { + if(heap->last_block+1 == heap->block_cnt) { + tmp = heap_realloc(heap->blocks, (heap->block_cnt+1)*sizeof(void*)); + if(!tmp) + return NULL; + heap->blocks = tmp; + } + + tmp = heap_alloc(block_size(heap->block_cnt+1)); + if(!tmp) + return NULL; + + heap->blocks[heap->block_cnt++] = tmp; + + heap->last_block++; + heap->offset = size; + return heap->blocks[heap->last_block]; + } + + list = heap_alloc(size + sizeof(struct list)); + if(!list) + return NULL; + + list_add_head(&heap->custom_blocks, list); + return list+1; +} + +void jsheap_clear(jsheap_t *heap) +{ + struct list *tmp; + + while((tmp = list_next(&heap->custom_blocks, &heap->custom_blocks))) { + list_remove(tmp); + heap_free(tmp); + } +} + +void jsheap_free(jsheap_t *heap) +{ + DWORD i; + + jsheap_clear(heap); + + for(i=0; i < heap->block_cnt; i++) + heap_free(heap->blocks[i]); + heap_free(heap->blocks); + + jsheap_init(heap); +} diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index dc96647..15584ca 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1512,6 +1512,7 @@ void parser_release(parser_ctx_t *ctx) if(--ctx->ref) return; + jsheap_free(&ctx->heap); heap_free(ctx); } @@ -1533,7 +1534,11 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, parser_ctx_t **ret) script_addref(ctx); parser_ctx->script = ctx; + jsheap_init(&parser_ctx->tmp_heap); + jsheap_init(&parser_ctx->heap); + parser_parse(parser_ctx); + jsheap_free(&parser_ctx->tmp_heap); if(FAILED(parser_ctx->hres)) { hres = parser_ctx->hres; parser_release(parser_ctx);

1 0

Jacek Caban : jscript: Added lexer.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: b51a156ff1571d8c0af9e87b92d7949d82ecd0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51a156ff1571d8c0af9e87b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 3 00:25:46 2008 +0200 jscript: Added lexer. --- dlls/jscript/Makefile.in | 3 +- dlls/jscript/lex.c | 687 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/parser.y | 6 - 3 files changed, 689 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b51a156ff1571d8c0af9e…

1 0

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 September 2008