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

Andrew Talbot : wined3d: Assign to structs instead of using memcpy.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 19c105c79c17f739b1252a3cc061fd2acd12a07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c105c79c17f739b1252a3cc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 20 22:25:13 2008 +0000 wined3d: Assign to structs instead of using memcpy. --- dlls/wined3d/device.c | 20 ++++++++++---------- dlls/wined3d/stateblock.c | 19 +++++++++---------- dlls/wined3d/surface_base.c | 4 ++-- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 158791f..7d208dc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1709,7 +1709,7 @@ static unsigned int ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the if (!elements) return 0; - memcpy(&elements[size-1], &end_element, sizeof(WINED3DVERTEXELEMENT)); + elements[size-1] = end_element; idx = 0; if (has_pos) { if (!has_blend && (fvf & WINED3DFVF_XYZRHW)) { @@ -2549,7 +2549,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTransform(IWineD3DDevice *iface, W if (This->isRecordingState) { TRACE("Recording... not performing anything\n"); This->updateStateBlock->changed.transform[d3dts] = TRUE; - memcpy(&This->updateStateBlock->transforms[d3dts], lpmatrix, sizeof(WINED3DMATRIX)); + This->updateStateBlock->transforms[d3dts] = *lpmatrix; return WINED3D_OK; } @@ -2589,7 +2589,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTransform(IWineD3DDevice *iface, W static HRESULT WINAPI IWineD3DDeviceImpl_GetTransform(IWineD3DDevice *iface, WINED3DTRANSFORMSTATETYPE State, WINED3DMATRIX* pMatrix) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : for Transform State %s\n", This, debug_d3dtstype(State)); - memcpy(pMatrix, &This->stateBlock->transforms[State], sizeof(WINED3DMATRIX)); + *pMatrix = This->stateBlock->transforms[State]; return WINED3D_OK; } @@ -2696,7 +2696,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLight(IWineD3DDevice *iface, DWORD I TRACE("... Range(%f), Falloff(%f), Theta(%f), Phi(%f)\n", pLight->Range, pLight->Falloff, pLight->Theta, pLight->Phi); /* Save away the information */ - memcpy(&object->OriginalParms, pLight, sizeof(WINED3DLIGHT)); + object->OriginalParms = *pLight; switch (pLight->Type) { case WINED3DLIGHT_POINT: @@ -2788,7 +2788,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetLight(IWineD3DDevice *iface, DWORD I return WINED3DERR_INVALIDCALL; } - memcpy(pLight, &lightInfo->OriginalParms, sizeof(WINED3DLIGHT)); + *pLight = lightInfo->OriginalParms; return WINED3D_OK; } @@ -2993,7 +2993,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetMaterial(IWineD3DDevice *iface, CONS IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; This->updateStateBlock->changed.material = TRUE; - memcpy(&This->updateStateBlock->material, pMaterial, sizeof(WINED3DMATERIAL)); + This->updateStateBlock->material = *pMaterial; /* Handle recording of state blocks */ if (This->isRecordingState) { @@ -3007,7 +3007,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetMaterial(IWineD3DDevice *iface, CONS static HRESULT WINAPI IWineD3DDeviceImpl_GetMaterial(IWineD3DDevice *iface, WINED3DMATERIAL* pMaterial) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - memcpy(pMaterial, &This->updateStateBlock->material, sizeof (WINED3DMATERIAL)); + *pMaterial = This->updateStateBlock->material; TRACE("(%p) : Diffuse (%f,%f,%f,%f)\n", This, pMaterial->Diffuse.r, pMaterial->Diffuse.g, pMaterial->Diffuse.b, pMaterial->Diffuse.a); TRACE("(%p) : Ambient (%f,%f,%f,%f)\n", This, pMaterial->Ambient.r, pMaterial->Ambient.g, @@ -3107,7 +3107,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetViewport(IWineD3DDevice *iface, CONS TRACE("(%p)\n", This); This->updateStateBlock->changed.viewport = TRUE; - memcpy(&This->updateStateBlock->viewport, pViewport, sizeof(WINED3DVIEWPORT)); + This->updateStateBlock->viewport = *pViewport; /* Handle recording of state blocks */ if (This->isRecordingState) { @@ -3126,7 +3126,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetViewport(IWineD3DDevice *iface, CONS static HRESULT WINAPI IWineD3DDeviceImpl_GetViewport(IWineD3DDevice *iface, WINED3DVIEWPORT* pViewport) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p)\n", This); - memcpy(pViewport, &This->stateBlock->viewport, sizeof(WINED3DVIEWPORT)); + *pViewport = This->stateBlock->viewport; return WINED3D_OK; } @@ -5806,7 +5806,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawRectPatch(IWineD3DDevice *iface, UI TRACE("Tesselation density or patch info changed, retesselating\n"); if(pRectPatchInfo) { - memcpy(&patch->RectPatchInfo, pRectPatchInfo, sizeof(*pRectPatchInfo)); + patch->RectPatchInfo = *pRectPatchInfo; } patch->numSegs[0] = pNumSegs[0]; patch->numSegs[1] = pNumSegs[1]; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0c7edad..e81a8ed 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -170,7 +170,7 @@ void stateblock_copy( Dest->material = This->material; Dest->pixelShader = This->pixelShader; Dest->glsl_program = This->glsl_program; - memcpy(&Dest->scissorRect, &This->scissorRect, sizeof(Dest->scissorRect)); + Dest->scissorRect = This->scissorRect; /* Lights */ memset(This->activeLights, 0, sizeof(This->activeLights)); @@ -185,7 +185,7 @@ void stateblock_copy( LIST_FOR_EACH(e1, &This->lightMap[l]) { PLIGHTINFOEL *light = LIST_ENTRY(e1, PLIGHTINFOEL, entry), *light2; light2 = HeapAlloc(GetProcessHeap(), 0, sizeof(*light)); - memcpy(light2, light, sizeof(*light)); + *light2 = *light; list_add_tail(&Dest->lightMap[l], &light2->entry); if(light2->glIndex != -1) Dest->activeLights[light2->glIndex] = light2; } @@ -342,7 +342,7 @@ static inline void record_lights(IWineD3DStateBlockImpl *This, IWineD3DStateBloc realLight = LIST_ENTRY(f, PLIGHTINFOEL, entry); if(realLight->OriginalIndex == src->OriginalIndex) { if(src->changed) { - memcpy(&src->OriginalParms, &realLight->OriginalParms, sizeof(src->OriginalParms)); + src->OriginalParms = realLight->OriginalParms; } if(src->enabledChanged) { /* Need to double check because enabledChanged does not catch enabled -> disabled -> enabled @@ -367,7 +367,7 @@ static inline void record_lights(IWineD3DStateBlockImpl *This, IWineD3DStateBloc continue; } else if(src->changed) { /* Otherwise assign defaul params */ - memcpy(&src->OriginalParms, &WINED3D_default_light, sizeof(src->OriginalParms)); + src->OriginalParms = WINED3D_default_light; } else { /* Not enabled by default */ src->glIndex = -1; @@ -477,9 +477,8 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) /* Others + Render & Texture */ for (i = 0; i < This->num_contained_transform_states; i++) { TRACE("Updating transform %d\n", i); - memcpy(&This->transforms[This->contained_transform_states[i]], - &targetStateBlock->transforms[This->contained_transform_states[i]], - sizeof(WINED3DMATRIX)); + This->transforms[This->contained_transform_states[i]] = + targetStateBlock->transforms[This->contained_transform_states[i]]; } if (This->changed.indices && ((This->pIndexData != targetStateBlock->pIndexData) @@ -506,14 +505,14 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) &This->material, sizeof(WINED3DMATERIAL)) != 0) { TRACE("Updating material\n"); - memcpy(&This->material, &targetStateBlock->material, sizeof(WINED3DMATERIAL)); + This->material = targetStateBlock->material; } if (This->changed.viewport && memcmp(&targetStateBlock->viewport, &This->viewport, sizeof(WINED3DVIEWPORT)) != 0) { TRACE("Updating viewport\n"); - memcpy(&This->viewport, &targetStateBlock->viewport, sizeof(WINED3DVIEWPORT)); + This->viewport = targetStateBlock->viewport; } if(This->changed.scissorRect && memcmp(&targetStateBlock->scissorRect, @@ -521,7 +520,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) sizeof(targetStateBlock->scissorRect))) { TRACE("Updating scissor rect\n"); - memcpy(&targetStateBlock->scissorRect, &This->scissorRect, sizeof(targetStateBlock->scissorRect)); + targetStateBlock->scissorRect = This->scissorRect; } for (i = 0; i < MAX_STREAMS; i++) { diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 14de5a5..00efa6c 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -849,7 +849,7 @@ IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, if (DestRect) { - memcpy(&xdst,DestRect,sizeof(xdst)); + xdst = *DestRect; } else { @@ -861,7 +861,7 @@ IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, if (SrcRect) { - memcpy(&xsrc,SrcRect,sizeof(xsrc)); + xsrc = *SrcRect; } else {

1 0

Michael Stefaniuc : devenum: Add the Romanian translation.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 3e67adf4999948242d2dc46eb4e5500415252a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e67adf4999948242d2dc46eb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 20 23:14:05 2008 +0100 devenum: Add the Romanian translation. --- dlls/devenum/devenum.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 1e7fea2..af2fed0 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -124,3 +124,12 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL 9 "Standaardapparaat WaveOut" 10 "Standaardapparaat MidiOut" } + +STRINGTABLE DISCARDABLE +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +{ + 7 "DirectSound implicit" + 8 "DirectSound: %s" + 9 "Dispozitiv WaveOut implicit" + 10 "Dispozitiv MidiOut implicit" +}

1 0

Michael Stefaniuc : oleaut32: Add the Romanian translation.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: d4c69921315c3619ff053263d0b33aec6c6c8f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c69921315c3619ff053263d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 20 23:26:58 2008 +0100 oleaut32: Add the Romanian translation. --- dlls/oleaut32/oleaut32.rc | 1 + dlls/oleaut32/oleaut32_Ro.rc | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/oleaut32.rc b/dlls/oleaut32/oleaut32.rc index 565076d..52e5d8d 100644 --- a/dlls/oleaut32/oleaut32.rc +++ b/dlls/oleaut32/oleaut32.rc @@ -39,6 +39,7 @@ #include "oleaut32_No.rc" #include "oleaut32_Pl.rc" #include "oleaut32_Pt.rc" +#include "oleaut32_Ro.rc" #include "oleaut32_Ru.rc" #include "oleaut32_Sv.rc" #include "oleaut32_Th.rc" diff --git a/dlls/oleaut32/oleaut32_Ro.rc b/dlls/oleaut32/oleaut32_Ro.rc new file mode 100644 index 0000000..52421a8 --- /dev/null +++ b/dlls/oleaut32/oleaut32_Ro.rc @@ -0,0 +1,34 @@ +/* + * Copyright 2003 Jon Griffiths + * 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) + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Adevărat" + IDS_FALSE "Fals" + IDS_YES "Da" + IDS_NO "Nu" + IDS_ON "Activat" + IDS_OFF "Dezactivat" +} + +#pragma code_page(default)

1 0

Michael Stefaniuc : comdlg32: Update the German translation.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 76344b78606e5abda901e7b45a9bf02e16439c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=76344b78606e5abda901e7b45… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 20 23:13:52 2008 +0100 comdlg32: Update the German translation. --- dlls/comdlg32/cdlg_De.rc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg_De.rc b/dlls/comdlg32/cdlg_De.rc index bdb35d6..ed4ba97 100644 --- a/dlls/comdlg32/cdlg_De.rc +++ b/dlls/comdlg32/cdlg_De.rc @@ -437,6 +437,14 @@ Bitte geben sie einen Wert zwischen %d und %d an." PD32_PRINTER_STATUS_POWER_SAVE "Stromsparmodus; " } +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "Normal" + IDS_FONT_BOLD "Fett" + IDS_FONT_ITALIC "Kursiv" + IDS_FONT_BOLD_ITALIC "Fett Kursiv" +} + STRINGTABLE DISCARDABLE /* Color names */ { IDS_COLOR_BLACK "Schwarz"

1 0

Michael Stefaniuc : quartz: Replace second EnterCriticalSection with LeaveCriticalSection (Smatch).
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 6ae786ec62e1c04df1618245ff9bb1d7e1dd6ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae786ec62e1c04df1618245f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 20 21:15:27 2008 +0100 quartz: Replace second EnterCriticalSection with LeaveCriticalSection (Smatch). --- dlls/quartz/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 5cfa313..6b22bf4 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -400,7 +400,7 @@ HRESULT WINAPI MediaSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * p EnterCriticalSection(This->crst); *pEarliest = 0; *pLatest = This->llDuration; - EnterCriticalSection(This->crst); + LeaveCriticalSection(This->crst); return S_OK; }

1 0

Kusanagi Kouichi : winex11.drv: Fix crash by long preedit text.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 53b9a53c27fcb43689015dbfc9fbf3ee0137ea78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b9a53c27fcb43689015dbfc… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Mar 21 04:52:49 2008 +0900 winex11.drv: Fix crash by long preedit text. --- dlls/winex11.drv/xim.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index a586af2..ad28bc5 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -293,9 +293,6 @@ static void XIMPreEditDoneCallback(XIC ic, XPointer client_data, XPointer call_d static void XIMPreEditDrawCallback(XIM ic, XPointer client_data, XIMPreeditDrawCallbackStruct *P_DR) { - DWORD dwOutput; - WCHAR wcOutput[64]; - TRACE("PreEditDrawCallback %p\n",ic); if (P_DR) @@ -306,14 +303,25 @@ static void XIMPreEditDrawCallback(XIM ic, XPointer client_data, { if (! P_DR->text->encoding_is_wchar) { + DWORD dwOutput; + WCHAR *wcOutput; + TRACE("multibyte\n"); dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, P_DR->text->string.multi_byte, -1, - wcOutput, 64); - - /* ignore null */ - dwOutput --; - X11DRV_ImmSetInternalString (GCS_COMPSTR, sel, len, wcOutput, dwOutput); + NULL, 0); + wcOutput = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR) * dwOutput); + if (wcOutput) + { + dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, + P_DR->text->string.multi_byte, -1, + wcOutput, dwOutput); + + /* ignore null */ + dwOutput --; + X11DRV_ImmSetInternalString (GCS_COMPSTR, sel, len, wcOutput, dwOutput); + HeapFree(GetProcessHeap(), 0, wcOutput); + } } else {

1 0

Paul Vriens : setupapi/tests: Add a test for installing a driver service via an INF file.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: ee08320d50ccf4b17204863088dc3c07418dfba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee08320d50ccf4b1720486308… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Mar 20 20:00:46 2008 +0100 setupapi/tests: Add a test for installing a driver service via an INF file. --- dlls/setupapi/tests/install.c | 94 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 89 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 3145ae4..77c74f8 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -28,6 +28,7 @@ #include "winnls.h" #include "winuser.h" #include "winreg.h" +#include "winsvc.h" #include "setupapi.h" #include "wine/test.h" @@ -83,10 +84,9 @@ static const char *cmdline_inf = "[Version]\n" "[Add.Settings]\n" "HKCU,Software\\Wine\\setupapitest,,\n"; -static void ok_cmdline(LPCSTR section, int mode, LPCSTR path, BOOL expectsuccess) +static void run_cmdline(LPCSTR section, int mode, LPCSTR path) { CHAR cmdline[MAX_PATH * 2]; - LONG ret; sprintf(cmdline, "%s %d %s", section, mode, path); if (pInstallHinfSectionA) pInstallHinfSectionA(NULL, NULL, cmdline, 0); @@ -96,6 +96,11 @@ static void ok_cmdline(LPCSTR section, int mode, LPCSTR path, BOOL expectsuccess MultiByteToWideChar(CP_ACP, 0, cmdline, -1, cmdlinew, MAX_PATH*2); pInstallHinfSectionW(NULL, NULL, cmdlinew, 0); } +} + +static void ok_registry(BOOL expectsuccess) +{ + LONG ret; /* Functional tests for success of install and clean up */ ret = RegDeleteKey(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest"); @@ -114,21 +119,99 @@ static void test_cmdline(void) create_inf_file(inffile, cmdline_inf); sprintf(path, "%s\\%s", CURR_DIR, inffile); - ok_cmdline("DefaultInstall", 128, path, TRUE); + run_cmdline("DefaultInstall", 128, path); + ok_registry(TRUE); ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError()); /* Test handling of spaces in path, unquoted and quoted */ create_inf_file(infwithspaces, cmdline_inf); sprintf(path, "%s\\%s", CURR_DIR, infwithspaces); - ok_cmdline("DefaultInstall", 128, path, TRUE); + run_cmdline("DefaultInstall", 128, path); + ok_registry(TRUE); sprintf(path, "\"%s\\%s\"", CURR_DIR, infwithspaces); - ok_cmdline("DefaultInstall", 128, path, FALSE); + run_cmdline("DefaultInstall", 128, path); + ok_registry(FALSE); ok(DeleteFile(infwithspaces), "Expected source inf to exist, last error was %d\n", GetLastError()); } +static void test_driver_install(void) +{ + HANDLE handle; + SC_HANDLE scm_handle, svc_handle; + BOOL ret; + char path[MAX_PATH], windir[MAX_PATH], driver[MAX_PATH]; + DWORD attrs; + /* Minimal stuff needed */ + static const char *inf = + "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DestinationDirs]\n" + "Winetest.DriverFiles=12\n" + "[DefaultInstall]\n" + "CopyFiles=Winetest.DriverFiles\n" + "[DefaultInstall.Services]\n" + "AddService=Winetest,,Winetest.Service\n" + "[Winetest.Service]\n" + "ServiceBinary=%12%\\winetest.sys\n" + "ServiceType=1\n" + "StartType=4\n" + "ErrorControl=1\n" + "[Winetest.DriverFiles]\n" + "winetest.sys"; + + /* Bail out if we are on win98 */ + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + + if (!scm_handle && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + skip("OpenSCManagerA is not implemented, we are most likely on win9x\n"); + return; + } + CloseServiceHandle(scm_handle); + + /* Place where we expect the driver to be installed */ + GetWindowsDirectoryA(windir, MAX_PATH); + lstrcpyA(driver, windir); + lstrcatA(driver, "\\system32\\drivers\\winetest.sys"); + + /* Create a dummy driver file */ + handle = CreateFileA("winetest.sys", GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + CloseHandle(handle); + + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + run_cmdline("DefaultInstall", 128, path); + + /* Driver should have been installed */ + attrs = GetFileAttributes(driver); + ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected driver to exist\n"); + + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + + /* Open the service to see if it's really there */ + svc_handle = OpenServiceA(scm_handle, "Winetest", DELETE); + todo_wine + ok(svc_handle != NULL, "Service was not created\n"); + + SetLastError(0xdeadbeef); + ret = DeleteService(svc_handle); + todo_wine + ok(ret, "Service could not be deleted : %d\n", GetLastError()); + + CloseServiceHandle(svc_handle); + CloseServiceHandle(scm_handle); + + /* File cleanup */ + DeleteFile(inffile); + DeleteFile("winetest.sys"); + DeleteFile(driver); +} + START_TEST(install) { HMODULE hsetupapi = GetModuleHandle("setupapi.dll"); @@ -171,6 +254,7 @@ START_TEST(install) assert(hhook != 0); test_cmdline(); + test_driver_install(); UnhookWindowsHookEx(hhook); }

1 0

Michael Moss : kernel32/tests: Test notifications for overlapping directory watches.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: ded68372a29eecc057718137a35f668f9d26d497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded68372a29eecc057718137a… Author: Michael Moss <mmoss(a)google.com> Date: Thu Mar 20 11:29:58 2008 -0700 kernel32/tests: Test notifications for overlapping directory watches. --- dlls/kernel32/tests/change.c | 87 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index b698eaa..7c90ccd 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -776,6 +776,92 @@ static void test_readdirectorychanges_filedir(void) ok( r == TRUE, "failed to remove directory\n"); } +static void test_ffcn_directory_overlap(void) +{ + HANDLE parent_watch, child_watch, parent_thread, child_thread; + char workdir[MAX_PATH], parentdir[MAX_PATH], childdir[MAX_PATH]; + char tempfile[MAX_PATH]; + DWORD threadId; + BOOL ret; + + /* Setup directory hierarchy */ + ret = GetTempPathA(MAX_PATH, workdir); + ok((ret > 0) && (ret <= MAX_PATH), + "GetTempPathA error: %d\n", GetLastError()); + + ret = GetTempFileNameA(workdir, "fcn", 0, tempfile); + ok(ret, "GetTempFileNameA error: %d\n", GetLastError()); + ret = DeleteFileA(tempfile); + ok(ret, "DeleteFileA error: %d\n", GetLastError()); + + lstrcpyA(parentdir, tempfile); + ret = CreateDirectoryA(parentdir, NULL); + ok(ret, "CreateDirectoryA error: %d\n", GetLastError()); + + lstrcpyA(childdir, parentdir); + lstrcatA(childdir, "\\c"); + ret = CreateDirectoryA(childdir, NULL); + ok(ret, "CreateDirectoryA error: %d\n", GetLastError()); + + + /* When recursively watching overlapping directories, changes in child + * should trigger notifications for both child and parent */ + parent_thread = StartNotificationThread(parentdir, TRUE, + FILE_NOTIFY_CHANGE_FILE_NAME); + child_thread = StartNotificationThread(childdir, TRUE, + FILE_NOTIFY_CHANGE_FILE_NAME); + + /* Create a file in child */ + ret = GetTempFileNameA(childdir, "fcn", 0, tempfile); + ok(ret, "GetTempFileNameA error: %d\n", GetLastError()); + + /* Both watches should trigger */ + ret = FinishNotificationThread(parent_thread); + ok(ret, "Missed parent notification\n"); + ret = FinishNotificationThread(child_thread); + ok(ret, "Missed child notification\n"); + + ret = DeleteFileA(tempfile); + ok(ret, "DeleteFileA error: %d\n", GetLastError()); + + + /* Removing a recursive parent watch should not affect child watches. Doing + * so used to crash wineserver. */ + parent_watch = FindFirstChangeNotificationA(parentdir, TRUE, + FILE_NOTIFY_CHANGE_FILE_NAME); + ok(parent_watch != INVALID_HANDLE_VALUE, + "FindFirstChangeNotification error: %d\n", GetLastError()); + child_watch = FindFirstChangeNotificationA(childdir, TRUE, + FILE_NOTIFY_CHANGE_FILE_NAME); + ok(child_watch != INVALID_HANDLE_VALUE, + "FindFirstChangeNotification error: %d\n", GetLastError()); + + ret = FindCloseChangeNotification(parent_watch); + ok(ret, "FindCloseChangeNotification error: %d\n", GetLastError()); + + child_thread = CreateThread(NULL, 0, NotificationThread, + (LPVOID)child_watch, 0, &threadId); + ok(child_thread != NULL, "CreateThread error: %d\n", GetLastError()); + + /* Create a file in child */ + ret = GetTempFileNameA(childdir, "fcn", 0, tempfile); + ok(ret, "GetTempFileNameA error: %d\n", GetLastError()); + + /* Child watch should trigger */ + ret = FinishNotificationThread(child_thread); + ok(ret, "Missed child notification\n"); + + /* clean up */ + ret = DeleteFileA(tempfile); + ok(ret, "DeleteFileA error: %d\n", GetLastError()); + + ret = RemoveDirectoryA(childdir); + ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); + + ret = RemoveDirectoryA(parentdir); + ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); +} + START_TEST(change) { HMODULE hkernel32 = GetModuleHandle("kernel32"); @@ -791,4 +877,5 @@ START_TEST(change) test_readdirectorychanges(); test_readdirectorychanges_null(); test_readdirectorychanges_filedir(); + test_ffcn_directory_overlap(); }

1 0

Alexandre Julliard : msvcrt: Add support for field width in scanf %c format .
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: 6ee428e3a079a76aefa34615713f8f754cdb5443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee428e3a079a76aefa346157… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 20 19:55:31 2008 +0100 msvcrt: Add support for field width in scanf %c format. --- dlls/msvcrt/scanf.h | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index a3ca454..07c64e8 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -331,8 +331,7 @@ _FUNCTION_ { else goto widecharstring; #endif /* WIDE_SCANF */ charstring: { /* read a word into a char */ - char*str = suppress ? NULL : va_arg(ap, char*); - char*sptr = str; + char *sptr = suppress ? NULL : va_arg(ap, char*); /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); @@ -348,9 +347,7 @@ _FUNCTION_ { } break; widecharstring: { /* read a word into a wchar_t* */ - MSVCRT_wchar_t*str = - suppress ? NULL : va_arg(ap, MSVCRT_wchar_t*); - MSVCRT_wchar_t*sptr = str; + MSVCRT_wchar_t *sptr = suppress ? NULL : va_arg(ap, MSVCRT_wchar_t*); /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); @@ -384,24 +381,26 @@ _FUNCTION_ { else goto widecharacter; #endif /* WIDE_SCANF */ character: { /* read single character into char */ - if (nch!=_EOF_) { - if (!suppress) { - char*c = va_arg(ap, char*); - *c = _CHAR2SUPPORTED_(nch); - } - st = 1; + char *str = suppress ? NULL : va_arg(ap, char*); + if (width == -1) width = 1; + while ((width != 0) && (nch != _EOF_)) + { + if (!suppress) *str++ = _CHAR2SUPPORTED_(nch); + st++; + width--; nch = _GETC_(file); } } break; widecharacter: { /* read single character into a wchar_t */ - if (nch!=_EOF_) { - if (!suppress) { - MSVCRT_wchar_t*c = va_arg(ap, MSVCRT_wchar_t*); - *c = _WIDE2SUPPORTED_(nch); - } + MSVCRT_wchar_t *str = suppress ? NULL : va_arg(ap, MSVCRT_wchar_t*); + if (width == -1) width = 1; + while ((width != 0) && (nch != _EOF_)) + { + if (!suppress) *str++ = _WIDE2SUPPORTED_(nch); + st++; + width--; nch = _GETC_(file); - st = 1; } } break;

1 0

Herve Chanal : cmd: Add a nicer icon.
by Alexandre Julliard March 21, 2008

March 21, 2008

Module: wine Branch: master Commit: e9ee629da4c080716ad187fc8e5fe801be2a8b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ee629da4c080716ad187fc8… Author: Herve Chanal <chanal_herve(a)yahoo.fr> Date: Thu Mar 20 15:02:19 2008 +0100 cmd: Add a nicer icon. --- programs/cmd/Makefile.in | 2 + programs/cmd/wcmd.ico | Bin 2238 -> 15086 bytes programs/cmd/wcmd.svg | 208 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 210 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9ee629da4c080716ad18…

1 0