July 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Only invalidate state for the current context in tesselate_rectpatch().
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 7e3f85cab6c2a5111f9f96ca4d9f0f0cafffbd2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3f85cab6c2a5111f9f96ca4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 27 21:13:34 2011 +0200 wined3d: Only invalidate state for the current context in tesselate_rectpatch(). --- dlls/wined3d/drawprim.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index bbcfc59..6133182 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -875,7 +875,7 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch */ glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)"); - device_invalidate_state(This, STATE_RENDER(WINED3DRS_FILLMODE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_FILLMODE)); if (patch->has_normals) { static const GLfloat black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -887,30 +887,30 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch checkGLcall("glEnable(GL_LIGHTING)"); glLightModelfv(GL_LIGHT_MODEL_AMBIENT, black); checkGLcall("glLightModel for MODEL_AMBIENT"); - device_invalidate_state(This, STATE_RENDER(WINED3DRS_AMBIENT)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_AMBIENT)); for (i = 3; i < context->gl_info->limits.lights; ++i) { glDisable(GL_LIGHT0 + i); checkGLcall("glDisable(GL_LIGHT0 + i)"); - device_invalidate_state(This, STATE_ACTIVELIGHT(i)); + context_invalidate_state(context, STATE_ACTIVELIGHT(i)); } - device_invalidate_state(This, STATE_ACTIVELIGHT(0)); + context_invalidate_state(context, STATE_ACTIVELIGHT(0)); glLightfv(GL_LIGHT0, GL_DIFFUSE, red); glLightfv(GL_LIGHT0, GL_SPECULAR, black); glLightfv(GL_LIGHT0, GL_AMBIENT, black); glLightfv(GL_LIGHT0, GL_POSITION, red); glEnable(GL_LIGHT0); checkGLcall("Setting up light 1"); - device_invalidate_state(This, STATE_ACTIVELIGHT(1)); + context_invalidate_state(context, STATE_ACTIVELIGHT(1)); glLightfv(GL_LIGHT1, GL_DIFFUSE, green); glLightfv(GL_LIGHT1, GL_SPECULAR, black); glLightfv(GL_LIGHT1, GL_AMBIENT, black); glLightfv(GL_LIGHT1, GL_POSITION, green); glEnable(GL_LIGHT1); checkGLcall("Setting up light 2"); - device_invalidate_state(This, STATE_ACTIVELIGHT(2)); + context_invalidate_state(context, STATE_ACTIVELIGHT(2)); glLightfv(GL_LIGHT2, GL_DIFFUSE, blue); glLightfv(GL_LIGHT2, GL_SPECULAR, black); glLightfv(GL_LIGHT2, GL_AMBIENT, black); @@ -918,8 +918,8 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch glEnable(GL_LIGHT2); checkGLcall("Setting up light 3"); - device_invalidate_state(This, STATE_MATERIAL); - device_invalidate_state(This, STATE_RENDER(WINED3DRS_COLORVERTEX)); + context_invalidate_state(context, STATE_MATERIAL); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORVERTEX)); glDisable(GL_COLOR_MATERIAL); glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, black); glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, black);

1 0

André Hentschel : view: Don't load icons, we don' t have one yet.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 77e1b38f26eaf43ea99cba72948d27c3f57df4cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e1b38f26eaf43ea99cba729… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 27 21:04:48 2011 +0200 view: Don't load icons, we don't have one yet. --- programs/view/view.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 6fdf1a3..0ce3ea4 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -277,16 +277,13 @@ static BOOL InitApplication(HINSTANCE hInstance) main window */ wc.cbSize = sizeof(WNDCLASSEX); - - /* Load small icon image */ - wc.hIconSm = LoadImage(hInstance, MAKEINTRESOURCEA(IDI_APPICON), IMAGE_ICON, 16, 16, 0); - wc.style = CS_HREDRAW | CS_VREDRAW; /* Class style(s) */ wc.lpfnWndProc = WndProc; /* Window Procedure */ wc.cbClsExtra = 0; /* No per-class extra data */ wc.cbWndExtra = 0; /* No per-window extra data */ wc.hInstance = hInstance; /* Owner of this class */ - wc.hIcon = LoadIcon(hInstance, szAppName); /* Icon name from .rc */ + wc.hIcon = NULL; + wc.hIconSm = NULL; wc.hCursor = LoadCursor(NULL, IDC_ARROW); /* Cursor */ wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); /* Default color */ wc.lpszMenuName = szAppName; /* Menu name from .rc */

1 0

André Hentschel : shlwapi/tests: Don' t access memory when the allocation failed.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 787ab4572d3e20e8f855ce938aa967f4b0608e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=787ab4572d3e20e8f855ce938… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 27 20:40:50 2011 +0200 shlwapi/tests: Don't access memory when the allocation failed. --- dlls/shlwapi/tests/ordinal.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index bfda161..cde3378 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2889,8 +2889,11 @@ static void test_SHGetShellKey(void) hres = pSKAllocValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, (void**)&alloc_data, &size); ok(hres == S_OK, "hres= %x\n", hres); ok(size == sizeof(DWORD), "size = %d\n", size); - ok(*alloc_data == 1234, "*alloc_data = %d\n", *alloc_data); - LocalFree(alloc_data); + if (SUCCEEDED(hres)) + { + ok(*alloc_data == 1234, "*alloc_data = %d\n", *alloc_data); + LocalFree(alloc_data); + } hres = pSKDeleteValueW(SHKEY_Root_HKLM, WineTestW, NULL); ok(hres == S_OK, "hres = %x\n", hres);

1 0

Matteo Bruni : d3d9/tests: Add a couple of fog tests.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: afd1fe43890026540703c9bc146fba49da316325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd1fe43890026540703c9bc1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 22 20:33:07 2011 +0200 d3d9/tests: Add a couple of fog tests. --- dlls/d3d9/tests/visual.c | 146 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 140 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7651069..499ea5f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -928,6 +928,50 @@ static void fog_test(IDirect3DDevice9 *device) }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; + const float ident_mat[16] = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + const float world_mat1[16] = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, -0.5f, 1.0f + }; + const float world_mat2[16] = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 1.0f + }; + const float proj_mat[16] = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, -1.0f, 1.0f + }; + + const struct sVertex far_quad1[] = + { + {-1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, + {-1.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, + { 0.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, + { 0.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, + }; + const struct sVertex far_quad2[] = + { + {-1.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, + {-1.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, + { 0.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, + { 0.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, + }; + memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps returned %08x\n", hr); @@ -1144,15 +1188,105 @@ static void fog_test(IDirect3DDevice9 *device) break; } } + + if (caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE) + { + /* A simple fog + non-identity world matrix test */ + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(0), (const D3DMATRIX *)world_mat1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform returned %#08x\n", hr); + + start = 0.0; + end = 1.0; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *)&start)); + ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *)&end)); + ok(hr == D3D_OK, "Setting fog end returned %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); + ok(hr == D3D_OK, "Setting fog table mode to D3DFOG_LINEAR returned %#08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_NONE); + ok(hr == D3D_OK, "Turning off vertex fog returned %#08x\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %#08x\n", hr); + + if (IDirect3DDevice9_BeginScene(device) == D3D_OK) + { + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR); + ok(hr == D3D_OK, "SetVertexShader returned %#08x\n", hr); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, Indices, D3DFMT_INDEX16, far_quad1, sizeof(far_quad1[0])); + ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, Indices, D3DFMT_INDEX16, far_quad2, sizeof(far_quad2[0])); + ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "EndScene returned %#08x\n", hr); + } + else + { + ok(FALSE, "BeginScene failed\n"); + } + + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00ff0000, 4), "Unfogged quad has color %08x\n", color); + color = getPixelColor(device, 160, 120); + ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + + /* Test fog behavior with an orthogonal (but non-identity) projection matrix */ + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(0), (const D3DMATRIX *)world_mat2); + ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, (const D3DMATRIX *)proj_mat); + ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + ok(hr == D3D_OK, "Clear returned %#08x\n", hr); + + if (IDirect3DDevice9_BeginScene(device) == D3D_OK) + { + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR); + ok(hr == D3D_OK, "SetVertexShader returned %#08x\n", hr); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, Indices, D3DFMT_INDEX16, untransformed_1, sizeof(untransformed_1[0])); + ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, Indices, D3DFMT_INDEX16, untransformed_2, sizeof(untransformed_2[0])); + ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "EndScene returned %#08x\n", hr); + } + else + { + ok(FALSE, "BeginScene failed\n"); + } + + color = getPixelColor(device, 160, 360); + todo_wine ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); + color = getPixelColor(device, 160, 120); + ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(0), (const D3DMATRIX *)ident_mat); + ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, (const D3DMATRIX *)ident_mat); + ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); + } + else + { + skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping some fog tests\n"); + } + /* Turn off the fog master switch to avoid confusing other tests */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); ok(hr == D3D_OK, "Turning off fog calculations returned %08x\n", hr); - start = 0.0; - end = 1.0; - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); - ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); - ok(hr == D3D_OK, "Setting fog end returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); ok( hr == D3D_OK, "Setting fog vertex mode to D3DFOG_LINEAR returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR);

1 0

André Hentschel : comctl32: Remove dead increments ( clang).
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: f931f479bcc2957c204ab887ce8607fb71324593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f931f479bcc2957c204ab887c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 27 21:08:13 2011 +0200 comctl32: Remove dead increments (clang). --- dlls/comctl32/propsheet.c | 1 - dlls/comctl32/rebar.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index f711399..3dd0713 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -543,7 +543,6 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, /* Extract the caption */ psInfo->proppage[index].pszText = p; TRACE("Tab %d %s\n",index,debugstr_w( p )); - p += lstrlenW( p ) + 1; if (dwFlags & PSP_USETITLE) { diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 99bde77..4242c64 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1577,7 +1577,7 @@ REBAR_SizeToHeight(REBAR_INFO *infoPtr, int height) } } else - extra -= REBAR_SizeChildrenToHeight(infoPtr, first_visible(infoPtr), infoPtr->uNumBands, extra / infoPtr->uNumRows, &fChanged); + REBAR_SizeChildrenToHeight(infoPtr, first_visible(infoPtr), infoPtr->uNumBands, extra / infoPtr->uNumRows, &fChanged); if (fChanged) REBAR_Layout(infoPtr);

1 0

Alexandre Julliard : rpcrt4/tests: Fix a test failure on 64-bit platforms.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 9d9f6da7da4dee9fe9743584196e2892f69f0497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9f6da7da4dee9fe97435841… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 11:25:04 2011 +0200 rpcrt4/tests: Fix a test failure on 64-bit platforms. --- dlls/rpcrt4/tests/server.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index ced357c..eb8f061 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -342,13 +342,13 @@ int __cdecl s_sum_cpsc(cpsc_t *cpsc) int __cdecl s_get_cpsc(int n, cpsc_t *cpsc) { - static int array[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; int i, ret; - cpsc->ca = array; - cpsc->a = min( 10, 2 * n ); + cpsc->a = 2 * n; cpsc->b = 2; cpsc->c = 1; + cpsc->ca = MIDL_user_allocate( cpsc->a * sizeof(int) ); + for (i = ret = 0; i < cpsc->a; i++) cpsc->ca[i] = i; for (i = ret = 0; i < cpsc->a; i++) ret += cpsc->ca[i]; return ret; }

1 0

André Hentschel : view: Handle the commandline.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 39f48dc8c99a09884bbecb96a4aa836877bf78cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f48dc8c99a09884bbecb96a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 27 21:04:43 2011 +0200 view: Handle the commandline. --- programs/view/view.c | 104 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 68 insertions(+), 36 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 917784d..6fdf1a3 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -23,6 +23,7 @@ #include <stdio.h> static HINSTANCE hInst; +static HWND hMainWnd; static char szAppName[5] = "View"; static char szTitle[80]; @@ -101,7 +102,7 @@ static BOOL FileIsPlaceable( LPCSTR szFileName ) return (apmh.key == APMHEADER_KEY); } -static HMETAFILE GetPlaceableMetaFile( HWND hwnd, LPCSTR szFileName ) +static HMETAFILE GetPlaceableMetaFile( LPCSTR szFileName ) { LPBYTE lpData; METAHEADER mfHeader; @@ -125,7 +126,7 @@ static HMETAFILE GetPlaceableMetaFile( HWND hwnd, LPCSTR szFileName ) char msg[128]; sprintf(msg, "Computed checksum %04x != stored checksum %04x\n", checksum, APMHeader.checksum); - MessageBox(hwnd, msg, "Checksum failed", MB_OK); + MessageBox(hMainWnd, msg, "Checksum failed", MB_OK); return 0; } @@ -150,16 +151,36 @@ static HMETAFILE GetPlaceableMetaFile( HWND hwnd, LPCSTR szFileName ) height = APMHeader.bbox.Bottom - APMHeader.bbox.Top; /* printf("Ok! width %d height %d inch %d\n", width, height, APMHeader.inch); */ - hdc = GetDC(hwnd); + hdc = GetDC(hMainWnd); width = width * GetDeviceCaps(hdc, LOGPIXELSX)/APMHeader.inch; height = height * GetDeviceCaps(hdc,LOGPIXELSY)/APMHeader.inch; - ReleaseDC(hwnd, hdc); + ReleaseDC(hMainWnd, hdc); deltax = 0; deltay = 0 ; return hmf; } +static void DoOpenFile(LPCSTR filename) +{ + if (!filename) return; + + isAldus = FileIsPlaceable(filename); + if (isAldus) { + hmf = GetPlaceableMetaFile(filename); + } else { + RECT r; + isEnhanced = FileIsEnhanced(filename); + if (isEnhanced) + enhmf = GetEnhMetaFile(filename); + else + hmf = GetMetaFile(filename); + GetClientRect(hMainWnd, &r); + width = r.right - r.left; + height = r.bottom - r.top; + } + InvalidateRect( hMainWnd, NULL, TRUE ); +} static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM lparam) { @@ -192,23 +213,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM case IDM_OPEN: { char filename[MAX_PATH]; - if (FileOpen(hwnd, filename, sizeof(filename))) { - isAldus = FileIsPlaceable(filename); - if (isAldus) { - hmf = GetPlaceableMetaFile(hwnd, filename); - } else { - RECT r; - isEnhanced = FileIsEnhanced(filename); - if (isEnhanced) - enhmf = GetEnhMetaFile(filename); - else - hmf = GetMetaFile(filename); - GetClientRect(hwnd, &r); - width = r.right - r.left; - height = r.bottom - r.top; - } - InvalidateRect( hwnd, NULL, TRUE ); - } + if (FileOpen(hwnd, filename, sizeof(filename))) + DoOpenFile(filename); } break; @@ -301,34 +307,58 @@ static BOOL InitApplication(HINSTANCE hInstance) static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { - HWND hwnd; - /* Save the instance handle in a global variable for later use */ hInst = hInstance; /* Create main window */ - hwnd = CreateWindow(szAppName, /* See RegisterClass() call */ - szTitle, /* window title */ - WS_OVERLAPPEDWINDOW, /* Window style */ - CW_USEDEFAULT, 0, /* positioning */ - CW_USEDEFAULT, 0, /* size */ - NULL, /* Overlapped has no parent */ - NULL, /* Use the window class menu */ - hInstance, - NULL); - - if (!hwnd) + hMainWnd = CreateWindow(szAppName, /* See RegisterClass() call */ + szTitle, /* window title */ + WS_OVERLAPPEDWINDOW, /* Window style */ + CW_USEDEFAULT, 0, /* positioning */ + CW_USEDEFAULT, 0, /* size */ + NULL, /* Overlapped has no parent */ + NULL, /* Use the window class menu */ + hInstance, + NULL); + + if (!hMainWnd) return FALSE; /* Call module specific instance initialization functions here */ /* show the window, and paint it for the first time */ - ShowWindow(hwnd, nCmdShow); - UpdateWindow(hwnd); + ShowWindow(hMainWnd, nCmdShow); + UpdateWindow(hMainWnd); return TRUE; } +static void HandleCommandLine(LPSTR cmdline) +{ + CHAR delimiter; + + /* skip white space */ + while (*cmdline == ' ') cmdline++; + + /* skip executable name */ + delimiter = (*cmdline == '"' ? '"' : ' '); + + if (*cmdline == delimiter) cmdline++; + while (*cmdline && *cmdline != delimiter) cmdline++; + if (*cmdline == delimiter) cmdline++; + + if (*cmdline) + { + /* file name is passed on the command line */ + if (cmdline[0] == '"') + { + cmdline++; + cmdline[lstrlen(cmdline) - 1] = 0; + } + DoOpenFile(cmdline); + } +} + int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, @@ -353,6 +383,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, return FALSE; } + HandleCommandLine(GetCommandLine()); + hAccelTable = LoadAccelerators(hInstance, szAppName); /* Main loop */

1 0

Matteo Bruni : ddraw/tests: Add a couple of fog tests.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 0c3481161226ab5e246f14e9784edbabd4db8e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c3481161226ab5e246f14e97… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 22 19:39:12 2011 +0200 ddraw/tests: Add a couple of fog tests. --- dlls/ddraw/tests/visual.c | 123 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 24ca8dc..acefb67 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -453,6 +453,50 @@ static void fog_test(IDirect3DDevice7 *device) }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; + float ident_mat[16] = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + float world_mat1[16] = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, -0.5f, 1.0f + }; + float world_mat2[16] = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 1.0f + }; + float proj_mat[16] = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, -1.0f, 1.0f + }; + + struct sVertex far_quad1[] = + { + {-1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, + {-1.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, + { 0.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, + { 0.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, + }; + struct sVertex far_quad2[] = + { + {-1.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, + {-1.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, + { 0.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, + { 0.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, + }; + memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice7_GetCaps(device, &caps); ok(hr == D3D_OK, "IDirect3DDevice7_GetCaps returned %08x\n", hr); @@ -541,6 +585,85 @@ static void fog_test(IDirect3DDevice7 *device) trace("Info: Table fog not supported by this device\n"); } + if (caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE) + { + /* A simple fog + non-identity world matrix test */ + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)world_mat1); + ok(hr == D3D_OK, "IDirect3DDevice7_SetTransform returned %#08x\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGTABLEMODE, D3DFOG_LINEAR); + ok(hr == D3D_OK, "Setting fog table mode to D3DFOG_LINEAR returned %#08x\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGVERTEXMODE, D3DFOG_NONE); + ok(hr == D3D_OK, "Turning off vertex fog returned %#08x\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice7_Clear returned %#08x\n", hr); + + if (IDirect3DDevice7_BeginScene(device) == D3D_OK) + { + hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, + D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, far_quad1, 4, Indices, 6, 0); + ok(hr == D3D_OK, "DrawIndexedPrimitive returned %#08x\n", hr); + + hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, + D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, far_quad2, 4, Indices, 6, 0); + ok(hr == D3D_OK, "DrawIndexedPrimitive returned %#08x\n", hr); + + hr = IDirect3DDevice7_EndScene(device); + ok(hr == D3D_OK, "EndScene returned %#08x\n", hr); + } + else + { + ok(FALSE, "BeginScene failed\n"); + } + + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00ff0000, 4), "Unfogged quad has color %08x\n", color); + color = getPixelColor(device, 160, 120); + ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + + /* Test fog behavior with an orthogonal (but not identity) projection matrix */ + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)world_mat2); + ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *)proj_mat); + ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + ok(hr == D3D_OK, "Clear returned %#08x\n", hr); + + if (IDirect3DDevice7_BeginScene(device) == D3D_OK) + { + hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, + D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, untransformed_1, 4, Indices, 6, 0); + ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); + + hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, + D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, untransformed_2, 4, Indices, 6, 0); + ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %#08x\n", hr); + + hr = IDirect3DDevice7_EndScene(device); + ok(hr == D3D_OK, "EndScene returned %#08x\n", hr); + } + else + { + ok(FALSE, "BeginScene failed\n"); + } + + color = getPixelColor(device, 160, 360); + todo_wine ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); + color = getPixelColor(device, 160, 120); + ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)ident_mat); + ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *)ident_mat); + ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); + } + else + { + skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping some fog tests\n"); + } + /* Turn off the fog master switch to avoid confusing other tests */ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, FALSE); ok(hr == D3D_OK, "Turning off fog calculations returned %08x\n", hr);

1 0

Andrew Eikum : winealsa.drv: Fix AudioRenderClient write pointer calculation.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 96aa86c99deeb12ff7c972370e2ca8fe4d1d8161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96aa86c99deeb12ff7c972370… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 27 11:50:42 2011 -0500 winealsa.drv: Fix AudioRenderClient write pointer calculation. --- dlls/winealsa.drv/mmdevdrv.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 4d92b17..dfbba63 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1877,8 +1877,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, *data = This->tmp_buffer; This->buf_state = LOCKED_WRAPPED; }else{ - *data = This->local_buffer + - This->lcl_offs_frames * This->fmt->nBlockAlign; + *data = This->local_buffer + write_pos * This->fmt->nBlockAlign; This->buf_state = LOCKED_NORMAL; } @@ -1924,7 +1923,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( if(This->buf_state == LOCKED_NORMAL) buffer = This->local_buffer + - This->lcl_offs_frames * This->fmt->nBlockAlign; + (This->lcl_offs_frames + This->held_frames) * This->fmt->nBlockAlign; else buffer = This->tmp_buffer;

1 0

Andrew Eikum : wineoss.drv: Choose default device using a better method.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: e0f1aa0b05b50f9dcc4ee7ea7428997fda168228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f1aa0b05b50f9dcc4ee7ea7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 27 12:15:06 2011 -0500 wineoss.drv: Choose default device using a better method. --- dlls/wineoss.drv/mmdevdrv.c | 44 +++++++++++++++++++++++++++++++++++------- 1 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 0fd0364..6c10a53 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -233,7 +233,40 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, +static UINT get_default_index(EDataFlow flow, char **keys, UINT num) +{ + int fd = -1, err, i; + oss_audioinfo ai; + + if(flow == eRender) + fd = open("/dev/dsp", O_WRONLY); + else + fd = open("/dev/dsp", O_RDONLY); + + if(fd < 0){ + WARN("Couldn't open default device!\n"); + return 0; + } + + ai.dev = -1; + if((err = ioctl(fd, SNDCTL_ENGINEINFO, &ai)) < 0){ + WARN("SNDCTL_ENGINEINFO failed: %d (%s)\n", err, strerror(err)); + close(fd); + return 0; + } + + close(fd); + + TRACE("Default devnode: %s\n", ai.devnode); + for(i = 0; i < num; ++i) + if(!strcmp(ai.devnode, keys[i])) + return i; + + WARN("Couldn't find default device! Choosing first.\n"); + return 0; +} + +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, UINT *num, UINT *def_index) { int i, mixer_fd; @@ -282,7 +315,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, *keys = HeapAlloc(GetProcessHeap(), 0, sysinfo.numaudios * sizeof(char *)); *num = 0; - *def_index = -1; for(i = 0; i < sysinfo.numaudios; ++i){ oss_audioinfo ai = {0}; int fd; @@ -340,18 +372,14 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, (*ids)[*num], len); - if(ai.caps & PCM_CAP_DEFAULT) - *def_index = *num; - (*num)++; } } - if(*def_index == -1) - *def_index = 0; - close(mixer_fd); + *def_index = get_default_index(flow, *keys, *num); + return S_OK; }

1 0