September 2008 - Wine-Commits

Paul Vriens : gdi32/tests: Skip some failing tests on NT4.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 84266fc6f617017814f5c4d0b17d410cb1b13f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84266fc6f617017814f5c4d0b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Sep 10 17:49:52 2008 +0200 gdi32/tests: Skip some failing tests on NT4. --- dlls/gdi32/tests/icm.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index b36165c..424082c 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -130,6 +130,15 @@ static void test_GetICMProfileW( HDC dc ) static void test_SetICMMode( HDC dc ) { INT ret, knob, save; + BOOL impl; + + SetLastError( 0xdeadbeef ); + impl = GetICMProfileA( NULL, NULL, NULL ); + if ( !impl && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) ) + { + skip( "On NT4 where SetICMMode is not implemented but this is not advertised\n" ); + return; + } SetLastError( 0xdeadbeef ); ret = SetICMMode( NULL, 0 );

1 0

Paul Vriens : gdi32/tests: Prevent a crash on win95.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: c50d922ef6470c9ca4be7f13f163c5ffa91631b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c50d922ef6470c9ca4be7f13f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Sep 10 17:47:49 2008 +0200 gdi32/tests: Prevent a crash on win95. --- dlls/gdi32/tests/icm.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 9d89828..b36165c 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -51,20 +51,28 @@ static void test_GetICMProfileA( HDC dc ) ret = GetICMProfileA( dc, &size, NULL ); ok( !ret, "GetICMProfileA succeeded\n" ); - ret = GetICMProfileA( dc, NULL, filename ); - ok( !ret, "GetICMProfileA succeeded\n" ); - size = MAX_PATH; ret = GetICMProfileA( NULL, &size, filename ); ok( !ret, "GetICMProfileA succeeded\n" ); size = 0; + filename[0] = 0; SetLastError(0xdeadbeef); ret = GetICMProfileA( dc, &size, filename ); error = GetLastError(); ok( !ret, "GetICMProfileA succeeded\n" ); ok( size, "expected size > 0\n" ); - ok( error == ERROR_INSUFFICIENT_BUFFER, "got %d, expected ERROR_INSUFFICIENT_BUFFER\n", error ); + ok( filename[0] == 0, "Expected filename to be empty\n" ); + ok( error == ERROR_INSUFFICIENT_BUFFER || + error == ERROR_SUCCESS, /* Win95 */ + "got %d, expected ERROR_INSUFFICIENT_BUFFER or ERROR_SUCCESS(Win95)\n", error ); + + /* Next test will crash on Win95 */ + if ( error == ERROR_INSUFFICIENT_BUFFER ) + { + ret = GetICMProfileA( dc, NULL, filename ); + ok( !ret, "GetICMProfileA succeeded\n" ); + } size = MAX_PATH; ret = GetICMProfileA( dc, &size, filename );

1 0

Stefan Dösinger : wined3d: Add a test for zenable= false, zwriteenable=false.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 631f751fe16f9896c20e5bb7e146613c3fca6129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=631f751fe16f9896c20e5bb7e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Sep 7 20:04:34 2008 -0500 wined3d: Add a test for zenable=false, zwriteenable=false. I suspected that in this situation d3d writes to the z buffer, but the test shows that I was mistaken --- dlls/d3d9/tests/visual.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c889e7e..6538a60 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9652,6 +9652,65 @@ static void dp3_alpha_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); } +static void zwriteenable_test(IDirect3DDevice9 *device) { + HRESULT hr; + DWORD color; + struct vertex quad1[] = { + { -1.0, -1.0, 0.1, 0x00ff0000}, + { -1.0, 1.0, 0.1, 0x00ff0000}, + { 1.0, -1.0, 0.1, 0x00ff0000}, + { 1.0, 1.0, 0.1, 0x00ff0000}, + }; + struct vertex quad2[] = { + { -1.0, -1.0, 0.9, 0x0000ff00}, + { -1.0, 1.0, 0.9, 0x0000ff00}, + { 1.0, -1.0, 0.9, 0x0000ff00}, + { 1.0, 1.0, 0.9, 0x0000ff00}, + }; + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x000000ff, 1.0f, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); + if(SUCCEEDED(hr)) { + /* The Z buffer is filled with 1.0. Draw a red quad with z = 0.1, zenable = D3DZB_FALSE, zwriteenable = TRUE. + * The red color is written because the z test is disabled. The question is wether the z = 0.1 values + * are written into the Z buffer. After the draw, set zenable = TRUE and draw a green quad at z = 0.9. + * If the values are written, the z test will fail(0.9 > 0.1) and the red color remains. If the values + * are not written, the z test succeeds(0.9 < 1.0) and the green color is written. It turns out that + * the screen is green, so zenable = D3DZB_FALSE and zwriteenable = TRUE does NOT write to the z buffer. + */ + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(*quad1)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed with 0x%08x\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed with 0x%08x\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1), "zwriteenable test returned 0x%08x, expected 0x0000ff00\n", + color); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -9748,6 +9807,7 @@ START_TEST(visual) tssargtemp_test(device_ptr); np2_stretch_rect_test(device_ptr); yuv_color_test(device_ptr); + zwriteenable_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) {

1 0

Stefan Dösinger : wined3d: Some ARB code fixes.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: ae7572217d6ddc591d23be7c1d0337e566af0f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae7572217d6ddc591d23be7c1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 5 13:45:38 2008 -0500 wined3d: Some ARB code fixes. --- dlls/wined3d/arb_program_shader.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d22ec7c..ba52fb1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2894,7 +2894,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB if (glGetError() == GL_INVALID_OPERATION) { GLint pos; glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); - FIXME("Vertex program error at position %d: %s\n", pos, + FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } HeapFree(GetProcessHeap(), 0, buffer.buffer); @@ -3442,7 +3442,10 @@ GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, WINED3DFORMAT fmt, GLenum text checkGLcall("GL_EXTCALL(glGenProgramsARB(1, &shader))"); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)"); - if(!shader) return 0; + if(!shader) { + HeapFree(GetProcessHeap(), 0, buffer.buffer); + return 0; + } /* The YUY2 and UYVY formats contain two pixels packed into a 32 bit macropixel, * giving effectively 16 bit per pixel. The color consists of a luminance(Y) and @@ -3491,10 +3494,12 @@ GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, WINED3DFORMAT fmt, GLenum text if(fmt == WINED3DFMT_UYVY || fmt ==WINED3DFMT_YUY2) { if(gen_planar_yuv_read(&buffer, fmt, textype, &luminance_component) == FALSE) { + HeapFree(GetProcessHeap(), 0, buffer.buffer); return 0; } } else { if(gen_yv12_read(&buffer, fmt, textype, &luminance_component) == FALSE) { + HeapFree(GetProcessHeap(), 0, buffer.buffer); return 0; } } @@ -3519,6 +3524,7 @@ GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, WINED3DFORMAT fmt, GLenum text FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } + HeapFree(GetProcessHeap(), 0, buffer.buffer); if(fmt == WINED3DFMT_YUY2) { if(textype == GL_TEXTURE_RECTANGLE_ARB) {

1 0

Stefan Dösinger : wined3d: Don' t disable arbfp if the pipeline replacement is in.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 035729ab9782a2a31e4cd3650cae1ea80dbdfa01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=035729ab9782a2a31e4cd3650… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 5 12:58:58 2008 -0500 wined3d: Don't disable arbfp if the pipeline replacement is in. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a8d5633..d22ec7c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1908,7 +1908,7 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id); - } else if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + } else if(!priv->use_arbfp_fixed_func) { glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); }

1 0

Kai Blin : dpnet: Fix initialisation of This pointer (Coverity).
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 0214ee8ee8a2ad72e0919cd64d1d1582f903b9b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0214ee8ee8a2ad72e0919cd64… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Sep 10 16:35:04 2008 +0200 dpnet: Fix initialisation of This pointer (Coverity). --- dlls/dpnet/threadpool.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c index 1c53050..1ab045d 100644 --- a/dlls/dpnet/threadpool.c +++ b/dlls/dpnet/threadpool.c @@ -65,7 +65,7 @@ static ULONG WINAPI IDirectPlay8ThreadPoolImpl_AddRef(PDIRECTPLAY8THREADPOOL ifa static ULONG WINAPI IDirectPlay8ThreadPoolImpl_Release(PDIRECTPLAY8THREADPOOL iface) { - IDirectPlay8ThreadPoolImpl* This = (IDirectPlay8ThreadPoolImpl*)This; + IDirectPlay8ThreadPoolImpl* This = (IDirectPlay8ThreadPoolImpl*)iface; ULONG RefCount = InterlockedDecrement(&This->ref); if(!RefCount)

1 0

Paul Vriens : msi/tests: Create only one log file and delete it afterwards.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 58ddb6f564beba06c07efc56bb82ed7c01f2aa91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ddb6f564beba06c07efc56b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Sep 10 14:34:13 2008 +0200 msi/tests: Create only one log file and delete it afterwards. --- dlls/msi/tests/install.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 239abb6..a3f4083 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5459,6 +5459,11 @@ START_TEST(install) ret = notify_system_change(BEGIN_NESTED_SYSTEM_CHANGE, &status); } + /* Create only one log file and don't append. We have to pass something + * for the log mode for this to work. + */ + MsiEnableLogA(INSTALLLOGMODE_FATALEXIT, "msitest.log", 0); + test_MsiInstallProduct(); test_MsiSetComponentState(); test_packagecoltypes(); @@ -5495,6 +5500,8 @@ START_TEST(install) test_MsiConfigureProductEx(); test_missingcomponent(); + DeleteFileA("msitest.log"); + if (pSRSetRestorePointA && ret) { ret = notify_system_change(END_NESTED_SYSTEM_CHANGE, &status);

1 0

Paul Vriens : rpcrt4/tests: Fix some failures on XP-SP3.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 9ee160cf553f8f98453c958a53f4df98382256e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee160cf553f8f98453c958a5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Sep 10 16:00:40 2008 +0200 rpcrt4/tests: Fix some failures on XP-SP3. --- dlls/rpcrt4/tests/ndr_marshall.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 3cd1337..7b84780 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1191,11 +1191,17 @@ static void test_client_init(void) TEST_ZERO(fHasExtensions, "%d"); TEST_ZERO(fHasNewCorrDesc, "%d"); TEST_ZERO(fIsIn, "%d"); - TEST_ZERO(fIsOut, "%d"); + ok(stubMsg.fIsOut == 0 || + stubMsg.fIsOut == -1, /* XP-SP3 */ + "fIsOut should have been set to 0 or -1 instead of %d\n", stubMsg.fIsOut); TEST_ZERO(fIsOicf, "%d"); TEST_ZERO(fBufferValid, "%d"); - TEST_ZERO(fHasMemoryValidateCallback, "%d"); - TEST_ZERO(fInFree, "%d"); + ok(stubMsg.fHasMemoryValidateCallback == 0 || + stubMsg.fHasMemoryValidateCallback == -1, /* XP-SP3 */ + "fHasMemoryValidateCallback should have been set to 0 or -1 instead of %d\n", stubMsg.fHasMemoryValidateCallback); + ok(stubMsg.fInFree == 0 || + stubMsg.fInFree == -1, /* XP-SP3 */ + "fInFree should have been set to 0 or -1 instead of %d\n", stubMsg.fInFree); TEST_ZERO(fNeedMCCP, "%d"); ok(stubMsg.fUnused == 0 || stubMsg.fUnused == -2, /* Vista */ @@ -1302,11 +1308,17 @@ todo_wine TEST_ZERO(fHasExtensions, "%d"); TEST_ZERO(fHasNewCorrDesc, "%d"); TEST_ZERO(fIsIn, "%d"); - TEST_ZERO(fIsOut, "%d"); + ok(stubMsg.fIsOut == 0 || + stubMsg.fIsOut == -1, /* XP-SP3 */ + "fIsOut should have been set to 0 or -1 instead of %d\n", stubMsg.fIsOut); TEST_ZERO(fIsOicf, "%d"); trace("fBufferValid = %d\n", stubMsg.fBufferValid); - TEST_ZERO(fHasMemoryValidateCallback, "%d"); - TEST_ZERO(fInFree, "%d"); + ok(stubMsg.fHasMemoryValidateCallback == 0 || + stubMsg.fHasMemoryValidateCallback == -1, /* XP-SP3 */ + "fHasMemoryValidateCallback should have been set to 0 or -1 instead of %d\n", stubMsg.fHasMemoryValidateCallback); + ok(stubMsg.fInFree == 0 || + stubMsg.fInFree == -1, /* XP-SP3 */ + "fInFree should have been set to 0 or -1 instead of %d\n", stubMsg.fInFree); TEST_ZERO(fNeedMCCP, "%d"); ok(stubMsg.fUnused == 0 || stubMsg.fUnused == -2, /* Vista */

1 0

Dmitry Timoshkov : gdi32: Don't use pOS2->usWeightClass, some fonts don' t set it correctly.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 067cbc57f38db9b60f89dbff0e2b99054afa59c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=067cbc57f38db9b60f89dbff0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 10 20:58:13 2008 +0900 gdi32: Don't use pOS2->usWeightClass, some fonts don't set it correctly. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 74e70ea..dcd60e3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5165,7 +5165,7 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, TM.tmAveCharWidth = 1; } TM.tmMaxCharWidth = (pFT_MulFix(ft_face->bbox.xMax - ft_face->bbox.xMin, x_scale) + 32) >> 6; - TM.tmWeight = font->fake_bold ? FW_BOLD : pOS2->usWeightClass; + TM.tmWeight = (font->fake_bold || (ft_face->style_flags & FT_STYLE_FLAG_BOLD)) ? FW_BOLD : FW_REGULAR; TM.tmOverhang = 0; TM.tmDigitizedAspectX = 300; TM.tmDigitizedAspectY = 300;

1 0

Hirofumi Katayama : notepad: Cancel closing window by cancelling "Save As" dialog box.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 32b6a1a08c6d50efbc2cee0e785856bf32c8a15a URL: http://source.winehq.org/git/wine.git/?a=commit;h=32b6a1a08c6d50efbc2cee0e7… Author: Hirofumi Katayama <katayama.hirofumi.mz(a)gmail.com> Date: Tue Sep 9 12:44:36 2008 +0900 notepad: Cancel closing window by cancelling "Save As" dialog box. --- programs/notepad/dialog.c | 12 +++++++----- programs/notepad/dialog.h | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 716abd8..0595f69 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -182,8 +182,7 @@ BOOL DoCloseFile(void) /* prompt user to save changes */ nResult = AlertFileNotSaved(Globals.szFileName); switch (nResult) { - case IDYES: DIALOG_FileSave(); - break; + case IDYES: return DIALOG_FileSave(); case IDNO: break; @@ -316,15 +315,16 @@ VOID DIALOG_FileOpen(VOID) } -VOID DIALOG_FileSave(VOID) +BOOL DIALOG_FileSave(VOID) { if (Globals.szFileName[0] == '\0') - DIALOG_FileSaveAs(); + return DIALOG_FileSaveAs(); else DoSaveFile(); + return TRUE; } -VOID DIALOG_FileSaveAs(VOID) +BOOL DIALOG_FileSaveAs(VOID) { OPENFILENAME saveas; WCHAR szPath[MAX_PATH]; @@ -352,7 +352,9 @@ VOID DIALOG_FileSaveAs(VOID) SetFileName(szPath); UpdateWindowCaption(); DoSaveFile(); + return TRUE; } + return FALSE; } typedef struct { diff --git a/programs/notepad/dialog.h b/programs/notepad/dialog.h index b141de7..d780991 100644 --- a/programs/notepad/dialog.h +++ b/programs/notepad/dialog.h @@ -20,8 +20,8 @@ VOID DIALOG_FileNew(VOID); VOID DIALOG_FileOpen(VOID); -VOID DIALOG_FileSave(VOID); -VOID DIALOG_FileSaveAs(VOID); +BOOL DIALOG_FileSave(VOID); +BOOL DIALOG_FileSaveAs(VOID); VOID DIALOG_FilePrint(VOID); VOID DIALOG_FilePageSetup(VOID); VOID DIALOG_FilePrinterSetup(VOID);

1 0